Finish updating users
Minor fixes