* Initial PR was merged before a proper review was performed * These fixes follow Martins review comments after merge