Bug fixes

Fixed an issue related to sharing of variables that was resulting in
certain views transitioning sooner than desired.