Fixes for HW2