Fixes to users, hopefully