More haxe3 changes