Fix other merge-caused problems