DeviceNotification fixes