pull requests fixes