More Mac fixes (nw)