fixes for Haxe3