More Mac fixes