Fixes for users and groups