Correlator API bug fixes