Round 2 of i82801AX fixes to get it into a usable shape.