Fixed Haxe3 compat. issues