Squashes more confirmation message bugs