Fixes for haxe3 rc2
Makefile would be handy for the repo...