Fix device types