Fix up some stuff post-tutorial