Some quick fixes in exercises after 'modeling-users'