DeviceSettings: Fixes