Tutorial regression fixes