Small fixes while running through the entire workshop