More fixes to pull request changes