FIXES FOR E'RRY LI'L FUCKER