Fix bugs lingering from merge mistakes.