Add better Darwin/OS X handling