Fixed permission updates

Fixes #1554
Closes #1557