Fixing problems from the merge