Fixed all the errors from the last pull request