More OS X support