PoldiAutoCorrelation - even more fixes for merging