User class fixes