Pull request review fixes