diff --git a/.gitmodules b/.gitmodules
index 4736b6b6a..e2e2e815e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,5 +4,5 @@
 	branch = main
 [submodule "ccpp-physics"]
 	path = ccpp/physics
-	url = https://github.com/MicroTed/ccpp-physics
-	branch = feature/nsslmicro
+	url = https://github.com/NCAR/ccpp-physics
+	branch = main
diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
index 6c3f24940..3847ec798 100644
--- a/scm/src/CMakeLists.txt
+++ b/scm/src/CMakeLists.txt
@@ -32,13 +32,23 @@ string(REGEX REPLACE "(.+),$" "\\1" SUITES ${SUITES})
 message (STATUS "Running ccpp_prebuild.py for CCPP")
 # Make the directories where the ccpp_prebuild.py script wants to write caps and make snippets
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/physics)
-execute_process(
-  COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}
-  OUTPUT_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.out
-  ERROR_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.err
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
-  RESULT_VARIABLE return_code
-)
+if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  execute_process(
+    COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR} --debug
+    OUTPUT_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.out
+    ERROR_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.err
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    RESULT_VARIABLE return_code
+    )
+else()
+  execute_process(
+    COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}
+    OUTPUT_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.out
+    ERROR_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.err
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    RESULT_VARIABLE return_code
+    )
+endif()
   
 # Check return code from CCPP prebuild.py
 if(return_code EQUAL 0)
diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
index 44b033150..940040968 100644
--- a/scm/src/GFS_typedefs.meta
+++ b/scm/src/GFS_typedefs.meta
@@ -9398,7 +9398,7 @@
   standard_name = flag_convective_tracer_transport_interstitial
   long_name = flag for interstitial tracer transport
   units = flag
-  dimensions = (number_of_tracers_plus_one)
+  dimensions = (number_of_tracers)
   type = logical
 [oz_coeffp5]
   standard_name = number_of_coefficients_in_ozone_forcing_data_plus_five