Fixed minor alarm manager bugs