More Mac improvements