Additional permissions fixes