Fixes for lesson