Fixed a few bugs concerning the pull request