Fixes for glitches in tutorial