Fix device types. closes #1929