more fixes for pull request