Fixes for new haxelib