User class minor changes