More fixes to make Intel13 happy