Fixed some code that didn't merge properly