User module bug fixes