Fix device code mismatch