Minor Haxe 3 fixes