Fixed job cancellation corner cases