Fixes for SystemConnector reports