User id and other fixes