Merged in robust covariance changes