More work on getting the sensor objects fixed