bug 978990 - Fix some scope updates, no verified function