Updated some stuff for OSX