Fixes for the MacOS X Cthulu Tide

Thanks @ideocentric!