Fixes on tutorial