Tweaks to sensor data collector