Bug fixes for new perms