Minor bugfixes for data collectors