more data collection fixes

Author git <vivec@telvanni.eu>
Author date 2018-02-15 18:18:23
Author local date 2018-02-15 19:18:23 +0100
Committer git <vivec@telvanni.eu>
Committer date 2018-02-15 18:18:23
Committer local date 2018-02-15 19:18:23 +0100
Commit 0039473003be50b9a49c7870cde34e1b89af74c2
Tree 99c1c8ac53db80d0af90b7e12333adb2a55189cb
Parent 0153b448481d3dedf5fe050f2b46af978f84c56d
more data collection fixes