Fixed segfault when correlating and then deleteing the correlators for multiple objects.
A number of fixes.