Updates for MacOS X building