more improvements for job cancel