diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index 4e97351e57..74220ecde4 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -677,11 +677,11 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
 
 			Val* path_arg;
 			if ( filter->path_val )
-				path_arg = filter->path_val;
+				path_arg = filter->path_val->Ref();
 			else
 				path_arg = new StringVal("");
 
-			vl.append(path_arg->Ref());
+			vl.append(path_arg);
 
 			Val* rec_arg;
 			BroType* rt = filter->path_func->FType()->Args()->FieldType("rec");
@@ -715,7 +715,6 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
 
 			if ( ! filter->path_val )
 				{
-				Unref(path_arg);
 				filter->path = v->AsString()->CheckString();
 				filter->path_val = v->Ref();
 				}
diff --git a/src/threading/Manager.cc b/src/threading/Manager.cc
index f5770e2dd8..43eb0313f4 100644
--- a/src/threading/Manager.cc
+++ b/src/threading/Manager.cc
@@ -102,25 +102,25 @@ void Manager::Process()
 			next_beat = 0;
 			}
 
-		if ( ! t->HasOut() )
-			continue;
-
-		Message* msg = t->RetrieveOut();
-
-		if ( msg->Process() )
+		while ( t->HasOut() )
 			{
-			if ( network_time )
-				did_process = true;
+			Message* msg = t->RetrieveOut();
+
+			if ( msg->Process() )
+				{
+				if ( network_time )
+					did_process = true;
+				}
+
+			else
+				{
+				string s = msg->Name() + " failed, terminating thread";
+				reporter->Error("%s", s.c_str());
+				t->Stop();
 			}
 
-		else
-			{
-			string s = msg->Name() + " failed, terminating thread";
-			reporter->Error("%s", s.c_str());
-			t->Stop();
+			delete msg;
 			}
-
-		delete msg;
 		}
 
 //	fprintf(stderr, "P %.6f %.6f do_beat=%d did_process=%d next_next=%.6f\n", network_time, timer_mgr->Time(), do_beat, (int)did_process, next_beat);
diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc
index b7782b9a05..145e16c57b 100644
--- a/src/threading/MsgThread.cc
+++ b/src/threading/MsgThread.cc
@@ -281,7 +281,7 @@ void MsgThread::GetStats(Stats* stats)
 	{
 	stats->sent_in = cnt_sent_in;
 	stats->sent_out = cnt_sent_out;
-	stats->pending_in = cnt_sent_in - queue_in.Size();
-	stats->pending_out = cnt_sent_out - queue_out.Size();
+	stats->pending_in = queue_in.Size();
+	stats->pending_out = queue_out.Size();
 	}