Fix all the confirmation behavior