Fixes after scenario2 merge weirdness