COSMIT sphinx fixes