Pull Request fixes

before merge to master