Updates based on common HW5 errors