Couple more IVI changes and fix repos.yaml non-oss URLwq