more fixes from running scenarios