Fixes.
Merge branch 'vlen2_fix' into vlen2
Hack to partially fix Francesc bug.