Fixes most of the problems from a bad merge