COSMIT: Minor changes