SysID/ComponentID fixes