Fixing annoying crap