Fixed stuff for pull request