MNT: Fixes for data collection demo