vsl: additional fix ups