Fix up DEVICE_FEATURES usage