Some last fixes for tutorial