Finalize MacOS X support