Updated OS X support