Some minor changes to HW2