Fixes to the wiki20 tutorial