Additional scenarios and small fixes.