Finalize cancellation improvement