diff --git a/src/EventTrace.cc b/src/EventTrace.cc
index c487fb6801..793acde00d 100644
--- a/src/EventTrace.cc
+++ b/src/EventTrace.cc
@@ -74,7 +74,7 @@ static std::string escape_string(const u_char* b, int len)
 	return res + "\"";
 	}
 
-ValTrace::ValTrace(const ValPtr& _v)
+ValTrace::ValTrace(const ValPtr& _v) : v(_v)
 	{
 	v = _v;
 	t = v->GetType();
@@ -552,7 +552,7 @@ void ValTrace::ComputeVectorDelta(const ValTrace* prev, DeltaVector& deltas) con
 	auto n = elems.size();
 	auto prev_n = prev_elems.size();
 
-	// The following hasn't been tested for robustness to vector holes.
+	// TODO: The following hasn't been tested for robustness to vector holes.
 
 	if ( n < prev_n )
 		{
diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h
index 942893a79c..4659f7af2b 100644
--- a/src/analyzer/Analyzer.h
+++ b/src/analyzer/Analyzer.h
@@ -605,8 +605,8 @@ public:
 	 * use this method to attach additional data to the connections. A
 	 * call to BuildConnVal() will in turn trigger a call to
 	 * UpdateConnVal().
-	 * ### The above comment needs updating, there's no BuildConnVal()
-	 * ### anymore -VP
+	 * TODO: The above comment needs updating, there's no BuildConnVal()
+	 * anymore -VP
 	 *
 	 * @param conn_val The connenction value being updated.
 	 */