Merges in mac-specific changes