Fixed Mac OS X stuff