diff --git a/CHANGES b/CHANGES
index 34a6e6ed81..a0abba26a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-beta2-79 | 2018-11-07 10:27:00 -0600
+
+  * Fix coding conventions nits/typos (Vern Paxson, Corelight)
+
 2.6-beta2-77 | 2018-11-06 09:32:17 -0600
 
   * Switch GridFTP options from redef to option (Vlad Grigorescu)
diff --git a/VERSION b/VERSION
index 550c3aaebf..48e96e7c51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta2-77
+2.6-beta2-79
diff --git a/src/Conn.cc b/src/Conn.cc
index 2bcb82de26..9781fb175d 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -412,7 +412,7 @@ RecordVal* Connection::BuildConnVal()
 		id_val->Assign(2, new AddrVal(resp_addr));
 		id_val->Assign(3, port_mgr->Get(ntohs(resp_port), prot_type));
 
-		RecordVal *orig_endp = new RecordVal(endpoint);
+		RecordVal* orig_endp = new RecordVal(endpoint);
 		orig_endp->Assign(0, new Val(0, TYPE_COUNT));
 		orig_endp->Assign(1, new Val(0, TYPE_COUNT));
 		orig_endp->Assign(4, new Val(orig_flow_label, TYPE_COUNT));
@@ -423,7 +423,7 @@ RecordVal* Connection::BuildConnVal()
 		if ( memcmp(&orig_l2_addr, &null, l2_len) != 0 )
 			orig_endp->Assign(5, new StringVal(fmt_mac(orig_l2_addr, l2_len)));
 
-		RecordVal *resp_endp = new RecordVal(endpoint);
+		RecordVal* resp_endp = new RecordVal(endpoint);
 		resp_endp->Assign(0, new Val(0, TYPE_COUNT));
 		resp_endp->Assign(1, new Val(0, TYPE_COUNT));
 		resp_endp->Assign(4, new Val(resp_flow_label, TYPE_COUNT));
diff --git a/src/parse.y b/src/parse.y
index 6afab9c3bb..b5809a91d0 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -990,7 +990,7 @@ type:
 				{
 				NullStmt here;
 				if ( $1 )
-					$1->Error("not a BRO type", &here);
+					$1->Error("not a Bro type", &here);
 				$$ = error_type();
 				}
 			else