More permissions fixes