Fix covariance issues.