Update to Haxe3