more mac fixes