Minor fixes in User entity.