Fixes to your pull request