Tweaks to sclang