Fix device list