Allow a device's own headers to take precedence over global ones
Disble Java error stops
Add CM_DEVICE identifier