fixes to aid modifiers in detection of scope