Changes for build in MacOSX Mavericks