Fixes for the user class