Fixed some sysinfo collecting