Fixes for Lasso mode

A few fixes to match the behaviour of the language.