Fixes found during review of course material.
approved this merge request
mentioned in commit 103f8219
merged