Fixed minor issues with sysinfo and sysinfoxml types