3rd pull request fixes