Fixes requested in Pull Request