Small fixes in user data