DeviceSettings fixes