Fixed some errors that should have been fixed for the intial commit.