Small improvements to support data collection.