HW 12 Fixes