Some fix to User object