merge device spec fixups