Fix install/build dependencies. Mac build fixes