Some haxe3 fixes