Additional permission fixes