changes for maverick build
Changes for OSX