Some future cancellation tweaks