Correcting some errors from the merge pull