Sync Mac OS X support; bug fix
4 files changed