More fixes to confirmation message protocol handling.