Fixes to constants in scope