[NPermissions] Some fixes