Updated OSX setup