Fixes before tutorial