Haxe3 changes