Better support for MacOS X.