diff --git a/CHANGES b/CHANGES
index 957eb9d05a..866112f159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+6.0.0-dev.303 | 2023-04-03 16:37:02 +0200
+
+  * addressed static analysis concern about possible null pointer (Vern Paxson, Corelight)
+
+  * tweaks for "-O C++" of BTest's with conditional code (Vern Paxson, Corelight)
+
 6.0.0-dev.300 | 2023-04-03 13:32:40 +0200
 
   * minor ZAM BTest baseline updates (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 6536a94bb4..c27ec917e5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.300
+6.0.0-dev.303
diff --git a/src/script_opt/CPP/InitsInfo.cc b/src/script_opt/CPP/InitsInfo.cc
index c7eb4ebbc4..924150f317 100644
--- a/src/script_opt/CPP/InitsInfo.cc
+++ b/src/script_opt/CPP/InitsInfo.cc
@@ -329,6 +329,7 @@ AttrInfo::AttrInfo(CPPCompile* _c, const AttrPtr& attr) : CompoundItemInfo(_c)
 		else
 			{
 			ASSERT(a_e->Tag() == EXPR_RECORD_COERCE);
+			ASSERT(gi);
 			vals.emplace_back(Fmt(static_cast<int>(AE_RECORD)));
 			vals.emplace_back(Fmt(gi->Offset()));
 			}
diff --git a/testing/btest/language/at-if-lambda.zeek b/testing/btest/language/at-if-lambda.zeek
index 887a15c2c7..59fe8c942d 100644
--- a/testing/btest/language/at-if-lambda.zeek
+++ b/testing/btest/language/at-if-lambda.zeek
@@ -1,4 +1,5 @@
 # @TEST-DOC: Regression test for #2075 from 0xxon
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stderr
diff --git a/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek b/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
index 5f021ec746..f5e2366c30 100644
--- a/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
+++ b/testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
@@ -9,10 +9,8 @@ event analyzer_violation(c: connection, atype: AllAnalyzers::Tag, aid: count, re
 	print "analyzer_violation", c$id, atype, aid, reason;
 	}
 
-@if ( Version::at_least("5.1") )
 event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo)
 	{
 	print "reason", info$reason;
 	print "data", fmt("%s", info$data);
 	}
-@endif
diff --git a/testing/btest/supervisor/config-cluster-pcap.zeek b/testing/btest/supervisor/config-cluster-pcap.zeek
index a373d05702..88130c20f2 100644
--- a/testing/btest/supervisor/config-cluster-pcap.zeek
+++ b/testing/btest/supervisor/config-cluster-pcap.zeek
@@ -1,4 +1,5 @@
 # @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 #
 # @TEST-PORT: MANAGER_PORT
 # @TEST-PORT: WORKER_PORT