acu144426 - Fix miscellaneous problems found during integration testing