Fix things that got swapped around