Some Mac fixes