Couple minor bug fixes, plus final-ish OSX build