HW 2 fixes