More tweaks to tutorial scenario