Fixed a few problems that occured during tutorial testing.