haxe3 fixes