More hacking for OSX