Fixes for pull request