fix some CINDEE bugs