vsl: more fixups