Mac build fixes (#104)