Some minor modifications to confirmation handling.