More mac fixes