Fix some of the things that were broken by the merge