Some fixes for the OS X project.