Changes for OS X