Some fixes to lesson 04