Fix the fixes
I don't get paid enough for this shit.