A fix for stuff that isn't borked for me