Fix multiple awful mistakes I don't want to talk about