Overall CBI-UVL ineraction fixes