Cleaned up OS X support