diff --git a/src/Reassem.cc b/src/Reassem.cc
index 17d67b3255..14a7f8ebcc 100644
--- a/src/Reassem.cc
+++ b/src/Reassem.cc
@@ -31,7 +31,7 @@ DataBlock::DataBlock(const u_char* data, uint64 size, uint64 arg_seq,
 
 uint64 Reassembler::total_size = 0;
 
-Reassembler::Reassembler(int init_seq)
+Reassembler::Reassembler(uint64 init_seq)
 	{
 	blocks = last_block = 0;
 	trim_seq = last_reassem_seq = init_seq;
diff --git a/src/Reassem.h b/src/Reassem.h
index 870b122bad..39617f7816 100644
--- a/src/Reassem.h
+++ b/src/Reassem.h
@@ -25,7 +25,7 @@ public:
 
 class Reassembler : public BroObj {
 public:
-	Reassembler(int init_seq);
+	Reassembler(uint64 init_seq);
 	virtual ~Reassembler();
 
 	void NewBlock(double t, uint64 seq, uint64 len, const u_char* data);
diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc
index 4ad3c4f972..6d0d6ff4a4 100644
--- a/src/analyzer/protocol/tcp/TCP_Reassembler.cc
+++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc
@@ -27,7 +27,7 @@ static uint64 last_gap_bytes = 0;
 TCP_Reassembler::TCP_Reassembler(analyzer::Analyzer* arg_dst_analyzer,
 				TCP_Analyzer* arg_tcp_analyzer,
 				TCP_Reassembler::Type arg_type,
-				bool arg_is_orig, TCP_Endpoint* arg_endp)
+				TCP_Endpoint* arg_endp)
 	: Reassembler(1)
 	{
 	dst_analyzer = arg_dst_analyzer;
diff --git a/src/file_analysis/FileReassembler.cc b/src/file_analysis/FileReassembler.cc
index d05a573682..53c9888ddc 100644
--- a/src/file_analysis/FileReassembler.cc
+++ b/src/file_analysis/FileReassembler.cc
@@ -7,7 +7,7 @@ namespace file_analysis {
 
 class File;
 
-FileReassembler::FileReassembler(File *f, int starting_offset)
+FileReassembler::FileReassembler(File *f, uint64 starting_offset)
 	: Reassembler(starting_offset), the_file(f)
 	{
 	}
@@ -35,12 +35,12 @@ void FileReassembler::BlockInserted(DataBlock* start_block)
 		}
 	}
 
-void FileReassembler::Undelivered(int up_to_seq)
+void FileReassembler::Undelivered(uint64 up_to_seq)
 	{
 	// Not doing anything here yet.
 	}
 
-void FileReassembler::Overlap(const u_char* b1, const u_char* b2, int n)
+void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64 n)
 	{
 	// Not doing anything here yet.
 	}
diff --git a/src/file_analysis/FileReassembler.h b/src/file_analysis/FileReassembler.h
index 146171b6ed..c29563efc8 100644
--- a/src/file_analysis/FileReassembler.h
+++ b/src/file_analysis/FileReassembler.h
@@ -17,7 +17,7 @@ class File;
 class FileReassembler : public Reassembler {
 public:
 
-	FileReassembler(File* f, int starting_offset);
+	FileReassembler(File* f, uint64 starting_offset);
 	virtual ~FileReassembler();
 
 	void Done();
@@ -32,9 +32,9 @@ protected:
 
 	DECLARE_SERIAL(FileReassembler);
 
-	void Undelivered(int up_to_seq);
+	void Undelivered(uint64 up_to_seq);
 	void BlockInserted(DataBlock* b);
-	void Overlap(const u_char* b1, const u_char* b2, int n);
+	void Overlap(const u_char* b1, const u_char* b2, uint64 n);
 
 	unsigned int had_gap:1;
 	unsigned int did_EOF:1;
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.set_timeout_interval/bro..stdout b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.set_timeout_interval/bro..stdout
index 8b2826a925..58c15bbe8c 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.set_timeout_interval/bro..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.set_timeout_interval/bro..stdout
@@ -15,6 +15,7 @@ SHA1: 7d99803eaf3b6e8dfa3581348bc694089579d25a
 SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202
 FILE_TIMEOUT
 FILE_TIMEOUT
+FILE_OVER_NEW_CONNECTION
 FILE_STATE_REMOVE
 file #0, 0, 0
 [orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp]
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.out b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.out
index 9c123887e7..205693bc9a 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.out
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.out
@@ -14,6 +14,7 @@ MD5: fc13fee1d44ef737a3133f1298b21d28
 SHA1: 7d99803eaf3b6e8dfa3581348bc694089579d25a
 SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202
 FILE_TIMEOUT
+FILE_OVER_NEW_CONNECTION
 FILE_STATE_REMOVE
 file #0, 0, 0
 [orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp]