diff --git a/src/common/CvtFormat.cpp b/src/common/CvtFormat.cpp
index 21e834cece5..c68abe3a6e4 100644
--- a/src/common/CvtFormat.cpp
+++ b/src/common/CvtFormat.cpp
@@ -1347,7 +1347,7 @@ namespace
 					break;
 			}
 			if (strOffset >= strLength)
-				cb->err(Arg::Gds(isc_data_for_format_is_exhausted) << string(it->patternStr.data()));
+				cb->err(Arg::Gds(isc_data_for_format_is_exhausted) << string(it->patternStr.data(), it->patternStr.length()));
 
 			std::string_view patternStr = it->patternStr;
 
diff --git a/src/jrd/btr.cpp b/src/jrd/btr.cpp
index bf010642fa1..9c17b5af151 100644
--- a/src/jrd/btr.cpp
+++ b/src/jrd/btr.cpp
@@ -5807,7 +5807,7 @@ static ULONG insert_node(thread_db* tdbb,
 	// For checking on duplicate nodes we should find the first matching key.
 	UCHAR* pointer = find_node_start_point(bucket, key, 0, &prefix,
 						idx->idx_flags & idx_descending,
-						false, true, validateDuplicates ? NO_VALUE : newRecordNumber);
+						0, true, validateDuplicates ? NO_VALUE : newRecordNumber);
 	if (!pointer)
 		return NO_VALUE_PAGE;
 
@@ -6620,8 +6620,8 @@ static contents remove_leaf_node(thread_db* tdbb, index_insertion* insertion, WI
 	UCHAR* pointer;
 	USHORT prefix;
 	while (!(pointer = find_node_start_point(page, key, 0, &prefix,
-			(idx->idx_flags & idx_descending),
-			false, false,
+			idx->idx_flags & idx_descending,
+			0, false,
 			(validateDuplicates ? NO_VALUE : insertion->iib_number))))
 	{
 		page = (btree_page*) CCH_HANDOFF(tdbb, window, page->btr_sibling, LCK_write, pag_index);