Fix things that got swapped around

Fixes #109