several fixes user-related