Fix reference error
Some more normalization of user data