Autocorrelation fixes