Updates for MacOS X build