Fixes to user class