Cleanups for OSX