More tutorial fixes