More mac fixups.