Fixing some things that got broke on a merge