Small fixes in data_collect.