More conversion bugfixes for DeviceDBRDHelper