diff --git a/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt b/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt
index 15e465a5a..541321c97 100644
--- a/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt
+++ b/test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt
@@ -98,16 +98,16 @@ set(TribitsExampleMetaProject_COMMON_CONFIG_ARGS
 ##########################################################################################
 
 
-  set(cdash_build_url_expected_regex
+set(cdash_build_url_expected_regex
     "https://testing[.]sandia[.]gov/cdash/index[.]php[?]project=TribitsExampleMetaProject&filtercount=3&showfilters=1&filtercombine=and&field1=site&compare1=61&value1=CustomSite&field2=buildname&compare2=61&value2=CTestDriver_TribitsExMetaProj_clone_default_branch_remote&field3=buildstamp&compare3=61&value3=[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-Continuous" )
   # NOTE: Above, we have to repeat [0-9] 8 times and 4 times for the regex for
   # the number of digits in the buildstarttime.  CMake regex does not support
   # \d{8}-\d{4} :-(
 
-  set(cdash_revisions_builds_url_expected_regex
+set(cdash_revisions_builds_url_expected_regex
      "https://testing[.]sandia[.]gov/cdash/index.php[?]project=TribitsExampleMetaProject&filtercount=1&showfilters=1&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3")
 
-  set(cdash_revisions_nonpassing_tests_expected_regex
+set(cdash_revisions_nonpassing_tests_expected_regex
     "https://testing[.]sandia[.]gov/cdash/queryTests.php[?]project=TribitsExampleMetaProject&filtercount=2&showfilters=1&filtercombine=and&field1=revision&compare1=61&value1=863461e3035d24c632e175c087761e83db28bdc3&field2=status&compare2=62&value2=passed" )
 
 
diff --git a/tribits/core/utils/TribitsParseArgumentsHelpers.cmake b/tribits/core/utils/TribitsParseArgumentsHelpers.cmake
index c4cd79fdf..75327668f 100644
--- a/tribits/core/utils/TribitsParseArgumentsHelpers.cmake
+++ b/tribits/core/utils/TribitsParseArgumentsHelpers.cmake
@@ -84,7 +84,7 @@ endfunction()
 
 # @MACRO: tribits_assert_parse_arg_one_or_more_values()
 #
-# Assert that a set of parse argument have at least one value
+# Assert that a set of parse arguments have at least one value
 #
 # Usage::
 #
diff --git a/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake b/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
index 04166830c..c6904f119 100644
--- a/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
+++ b/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
@@ -458,8 +458,8 @@ function(tribits_get_cdash_site_from_drop_site_and_location)
   tribits_assert_parse_arg_one_value(PREFIX  CTEST_DROP_LOCATION)
   tribits_assert_parse_arg_one_value(PREFIX  CDASH_SITE_URL_OUT)
   # Get the full CDash site from parts
-  string(FIND "${PREFIX_CTEST_DROP_LOCATION}" "?" endOfSubmitPhpIdx)
-  string(SUBSTRING "${PREFIX_CTEST_DROP_LOCATION}" 0 ${endOfSubmitPhpIdx} submitPhpPart)
+  string(FIND "${PREFIX_CTEST_DROP_LOCATION}" "?" beginningOfQueryString)
+  string(SUBSTRING "${PREFIX_CTEST_DROP_LOCATION}" 0 ${beginningOfQueryString} submitPhpPart)
   string(REPLACE "/submit.php" "" endCDashUrl "${submitPhpPart}")
   set(cdashSiteUrl "${PREFIX_CTEST_DROP_SITE}${endCDashUrl}")
   set(${PREFIX_CDASH_SITE_URL_OUT} "https://${cdashSiteUrl}" PARENT_SCOPE)