Small fixes on User