Fixes to HW10