User and groups tweaks