Fix up some entires in DEVICE_DATA