diff --git a/src/Reporter.cc b/src/Reporter.cc
index 17c6744a89..4a8e35e650 100644
--- a/src/Reporter.cc
+++ b/src/Reporter.cc
@@ -139,7 +139,7 @@ void Reporter::WeirdHelper(EventHandlerPtr event, Val* conn_val, const char* nam
 	delete vl;
 	}
 
-void Reporter::WeirdFlowHelper(addr_type orig, addr_type resp, const char* name, ...)
+void Reporter::WeirdFlowHelper(const uint32* orig, const uint32* resp, const char* name, ...)
 	{
 	val_list* vl = new val_list(2);
 	vl->append(new AddrVal(orig));
@@ -168,7 +168,7 @@ void Reporter::Weird(Val* conn_val, const char* name, const char* addl)
 	WeirdHelper(conn_weird, conn_val, name, addl);
 	}
 
-void Reporter::Weird(addr_type orig, addr_type resp, const char* name)
+void Reporter::Weird(const uint32* orig, const uint32* resp, const char* name)
 	{
 	WeirdFlowHelper(orig, resp, name);
 	}
diff --git a/src/Reporter.h b/src/Reporter.h
index 6cadd3fb5b..bc919d3908 100644
--- a/src/Reporter.h
+++ b/src/Reporter.h
@@ -47,7 +47,7 @@ public:
 	void Weird(const char* name);	// Raises net_weird().
 	void Weird(Connection* conn, const char* name, const char* addl = "");	// Raises conn_weird().
 	void Weird(Val* conn_val, const char* name, const char* addl = "");	// Raises conn_weird().
-	void Weird(addr_type orig, addr_type resp, const char* name);	// Raises flow_weird().
+	void Weird(const uint32* orig, const uint32* resp, const char* name);	// Raises flow_weird().
 
 	// Syslog a message. This methods does nothing if we're running
 	// offline from a trace.
@@ -90,7 +90,7 @@ private:
 	void DoLog(const char* prefix, EventHandlerPtr event, FILE* out, Connection* conn, val_list* addl, bool location, bool time, const char* fmt, va_list ap);
 
 	void WeirdHelper(EventHandlerPtr event, Val* conn_val, const char* name, const char* addl, ...);
-	void WeirdFlowHelper(addr_type orig, addr_type resp, const char* name, ...);
+	void WeirdFlowHelper(const uint32* orig, const uint32* resp, const char* name, ...);
 
 	int errors;
 	bool via_events;
diff --git a/src/Sessions.cc b/src/Sessions.cc
index c0ef2d7cab..1678f6798f 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -1276,7 +1276,7 @@ void NetSessions::Weird(const char* name,
 
 void NetSessions::Weird(const char* name, const IP_Hdr* ip)
 	{
-	reporter->Weird(ip->SrcAddr4(), ip->DstAddr4(), name);
+	reporter->Weird(ip->SrcAddr(), ip->DstAddr(), name);
 	}
 
 unsigned int NetSessions::ConnectionMemoryUsage()
diff --git a/testing/external/.gitignore b/testing/external/.gitignore
index c55a0d04e3..2077736b5b 100644
--- a/testing/external/.gitignore
+++ b/testing/external/.gitignore
@@ -1,2 +1,3 @@
 *.git
 diag.log
+bro-testing