Fixes for cov and cor.