Fixes to HW3