Updates for haxe3