diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index f0f534a5b..81e87fcca 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -363,7 +363,7 @@ MAIN: while( $loop ) {
       }
 
       if ( ! $$Storage{Scheme} ) {
-        Debug("Storage Scheme not set on $$Storage{Name}");
+        Error("Storage Scheme not set on $$Storage{Name}");
         if ( ! chdir( $monitor_dir ) ) {
           Error( "Can't chdir directory '$$Storage{Path}/$monitor_dir': $!" );
           next;
@@ -477,6 +477,10 @@ MAIN: while( $loop ) {
             next;
           }
           Debug("Event $db_event is not in fs. Should have been at ".$Event->Path());
+          if ( $Event->Archived() ) {
+            Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
+            next;
+          }
           if ( ! $Event->StartTime() ) {
             Info("Event $$Event{Id} has no start time.  deleting it.");
             if ( confirm() ) {
diff --git a/utils/zm-alarm.pl b/utils/zm-alarm.pl
index 528328c61..d68c82663 100755
--- a/utils/zm-alarm.pl
+++ b/utils/zm-alarm.pl
@@ -14,9 +14,17 @@ $| = 1;
 
 my @monitors;
 my $dbh = zmDbConnect();
-my $sql = "SELECT * FROM Monitors";
-my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-my $res = $sth->execute() or die( "Can't execute '$sql': ".$sth->errstr() );
+
+my $sql = "SELECT * FROM Monitors
+  WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )".
+  ( $Config{ZM_SERVER_ID} ? 'AND ServerId=?' : '' )
+  ;
+
+my $sth = $dbh->prepare_cached( $sql )
+  or die( "Can't prepare '$sql': ".$dbh->errstr() );
+
+my $res = $sth->execute()
+  or die( "Can't execute '$sql': ".$sth->errstr() );
 
 while ( my $monitor = $sth->fetchrow_hashref() ) {
     push( @monitors, $monitor );
@@ -24,6 +32,12 @@ while ( my $monitor = $sth->fetchrow_hashref() ) {
 
 while (1) {
         foreach my $monitor (@monitors) {
+               # Check shared memory ok
+               if ( !zmMemVerify( $monitor ) ) {
+                 zmMemInvalidate( $monitor );
+                 next;
+                }
+
                 my $monitorState = zmGetMonitorState($monitor);
                 printState($monitor->{Id}, $monitor->{Name}, $monitorState);
         }