Confirmation dialog changes, regarding #340.