Fix issues in cancel / restore