Minor fixes for line vsh and unit tests.