Improved OS X support.