Fix Tutorial Bugs

Ghost User requested to merge (removed):master into master

These bugs prevent the tutorial from being completed.

Merge request reports