Mac improvements