Fixing old crap