Fixes to the user class