HW1 and HW2 fixes to handle end of game scenarios!