fixes for haxe3
merge
fixes