Fixed issues with Tutorial and i4