minor upgrade adjustments for escaping and skipping (#4841)