few minor changes from haxe2 to haxe 3.1.3