diff --git a/p2pApp/main.cpp b/p2pApp/main.cpp
index ecbc11c..404cc49 100644
--- a/p2pApp/main.cpp
+++ b/p2pApp/main.cpp
@@ -1,5 +1,6 @@
 
 #include <iocsh.h>
+#include <epicsExit.h>
 #include <libComRegister.h>
 
 #define epicsExportSharedSymbols
@@ -15,5 +16,6 @@ int main(int argc, char *argv[])
     int ret = iocsh(NULL);
     gwServerShutdown();
     gwClientShutdown();
+    epicsExit(ret);
     return ret;
 }
diff --git a/p2pApp/moncache.cpp b/p2pApp/moncache.cpp
index 255dc0c..02dbf10 100644
--- a/p2pApp/moncache.cpp
+++ b/p2pApp/moncache.cpp
@@ -172,8 +172,10 @@ MonitorUser::~MonitorUser()
 void
 MonitorUser::destroy()
 {
-    Guard G(entry->chan->cache->cacheLock);
-    running = false;
+    {
+        Guard G(entry->chan->cache->cacheLock);
+        running = false;
+    }
     req.reset();
 }