1133 Fix device definition bugs