Corner cases for scope changing