Fixing errors on moving commits from master

Made the mistake of commiting changes to master and when I went to move
those commits there were errors.