Hacky changes I'm pretty sad about