fixes for updated Cosmo