Some more work on the Mac.