* CBI: Minor changes