Minor changes to ContactDetector