Fix all the things

Soooo that was epic.