Added some MacOSX-specific stuff