Minor changes to usercode