Fix OS X support