Fix some lingering user/group/role confusion on my part