Fixes to scenario 4