Various fixes for tutorial