Fix bugs from requires confirmation changes