A few permission fixes