Minor changes related with scenario.