Minor manual fixes + convert fix for stable haxe

Yay!