Resolved flow ok/cancel dialog bugs