A few more HW 2 changes