Fixes in scenarios and line reading