Change routing of cancel/fail to simplify things