Fix issues with alarm identification