Confirmation tweaks

Resolves issue #2544