more haxe3 fixes