Fixed things for tutorial