Additions for Mac OS X