fixes for device notifications