Major bug fixes in users