acu103787 - More misc fixes.