Fixes to scenario 2