Fix all of the weirdness from earlier today