More fixes to fixes, because I'm an idiot who can't copy-paste text properly