COMP: tweaking to fix some minor inconsistencies.
COMP: CheckPoint. Verified through calls to BuildSensor