pull request fixes.