Minor changes and task to fix old ViSH LOs