fixes for haxe3
merge