diff --git a/src/postgres/src/backend/executor/ybc_fdw.c b/src/postgres/src/backend/executor/ybc_fdw.c
index 9e45336a7461..08a9d9928159 100644
--- a/src/postgres/src/backend/executor/ybc_fdw.c
+++ b/src/postgres/src/backend/executor/ybc_fdw.c
@@ -645,7 +645,7 @@ ybcIterateForeignScan(ForeignScanState *node)
 }
 
 #ifdef NEIL_TODO
-/* Keep this code till I look at ybFetchNext()
+/* Keep this code till I look at ybFetchNext() */
 {
 	/* Clear tuple slot before starting */
 	slot = node->ss.ss_ScanTupleSlot;
diff --git a/src/postgres/src/backend/optimizer/plan/createplan.c b/src/postgres/src/backend/optimizer/plan/createplan.c
index d9310b618334..25c0888e8daf 100644
--- a/src/postgres/src/backend/optimizer/plan/createplan.c
+++ b/src/postgres/src/backend/optimizer/plan/createplan.c
@@ -3520,10 +3520,12 @@ create_modifytable_plan(PlannerInfo *root, ModifyTablePath *best_path)
 	{
 		Assert(false);
 		/* YB_TODO(neil@yugabyte). Need rewrite - Code path wouldn't get here.
+		 * Still need to initialize for the compiler: -Wsometimes-uninitialized.
 		 *
 		 * subplan = (Plan *) make_result(result_tlist, NULL, NULL);
 		 * copy_generic_path_info(subplan, linitial(best_path->subpaths));
 		 */
+		subplan = NULL;
 	}
 	else
 	{