Cleanup for minor issues that came up while running through the tutorial for the first time.