Fix device identifier list