diff --git a/scripts/base/frameworks/file-analysis/main.bro b/scripts/base/frameworks/file-analysis/main.bro
index 7bc62997ae..2e5feee22b 100644
--- a/scripts/base/frameworks/file-analysis/main.bro
+++ b/scripts/base/frameworks/file-analysis/main.bro
@@ -127,16 +127,19 @@ function get_handle(c: connection, is_orig: bool): string
 	local cid: conn_id = c$id;
 
 	if ( "ftp-data" in c$service )
-		rval = fmt("%s: %s", "ftp-data", conn_str(c));
+		rval = fmt("%s ftp-data: %s", c$start_time, conn_str(c));
+
+	if ( "irc-dcc-data" in c$service )
+		rval = fmt("%s irc-dcc-data: %s", c$start_time, conn_str(c));
 
 	else if ( c?$http )
 		{
 		if ( c$http$range_request )
-			rval = fmt("http(%s): %s: %s", is_orig, c$id$orig_h,
-			           HTTP::build_url(c$http));
+			rval = fmt("%s http(%s): %s: %s", c$start_time, is_orig,
+			           c$id$orig_h, HTTP::build_url(c$http));
 		else
-			rval = fmt("http(%s, %s): %s", is_orig, c$http$trans_depth,
-			           conn_str(c));
+			rval = fmt("%s http(%s, %s): %s", c$start_time, is_orig,
+			           c$http$trans_depth, conn_str(c));
 		}
 
 	#print fmt("file handle: %s", rval);
diff --git a/src/HTTP.cc b/src/HTTP.cc
index 292db83765..f0f0fc7e96 100644
--- a/src/HTTP.cc
+++ b/src/HTTP.cc
@@ -855,6 +855,8 @@ void HTTP_Analyzer::Done()
 		Unref(unanswered_requests.front());
 		unanswered_requests.pop();
 		}
+
+	file_mgr->EndOfFile(Conn());
 	}
 
 void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)