[NGeneral] Fix
[NPermissions] Some minor tweaks