Bugfix with device alerts