Adapted to the new big changes of haxe on svn