pull request fixes