Further tweaks to OSX configuration