Pull Request Fixes