Beginnings of OS X support