Fixing more Mac OS stuff