Few more lesson fixes