Fixes for help request cancellation handling