Added stuff for OS X