older scenario fixes