Improve support for auto-permissions