Fix retry dialog bugs