Fixes to lesson bugs