More Haxe 3 fixes