Some fixes regarding the pull request