Fix broken stuff from the merge