More permission fixes