Haxe 2 compatibility changes