Improving OS X support