Codefixes for 1.6.2, didn't test it ingame.