more data collection fixes

Author git <vivec@telvanni.eu>
Author date 2018-02-15 18:51:52
Author local date 2018-02-15 19:51:52 +0100
Committer git <vivec@telvanni.eu>
Committer date 2018-02-15 18:51:52
Committer local date 2018-02-15 19:51:52 +0100
Commit 45d63dd91dab47246ae6cf63f7a0a8c87a278632
Tree 6db4c2c3fc103ce62f215700718e7603a02d2e85
Parent 0039473003be50b9a49c7870cde34e1b89af74c2
more data collection fixes