diff --git a/trick_source/codegen/Interface_Code_Gen/main.cpp b/trick_source/codegen/Interface_Code_Gen/main.cpp
index d16514e9..33b3f43f 100644
--- a/trick_source/codegen/Interface_Code_Gen/main.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/main.cpp
@@ -215,7 +215,7 @@ int main(int argc, char * argv[]) {
     ci.setASTConsumer(astConsumer);
 #endif
     ci.createASTContext();
-    ci.createSema(clang::TU_Prefix, NULL);
+    ci.createSema(clang::TU_Complete, NULL);
 
     // Get the full path of the file to be read
     char buffer[input_file_names[0].size() + 1];
diff --git a/trick_source/data_products/DPX/test/unit_test/makefile b/trick_source/data_products/DPX/test/unit_test/makefile
index ae671026..a2260f9f 100644
--- a/trick_source/data_products/DPX/test/unit_test/makefile
+++ b/trick_source/data_products/DPX/test/unit_test/makefile
@@ -47,7 +47,7 @@ DP_LIBS         = -L${TRICK_HOME}/trick_source/data_products/lib_${TRICK_HOST_CP
 MODEL_LIBS      = -lxml2 \
                   -L${DPX_DIR}/lib_${TRICK_HOST_CPU} -lDPM \
                   -L${TRICK_HOME}/trick_source/data_products/lib_${TRICK_HOST_CPU} -ltrick_units \
-                  ${GTEST_LIBS} -lpthread -ludunits2
+                  ${GTEST_LIBS} -lpthread -ludunits2 ${UDUNITS_LDFLAGS}
 CONTROLLER_LIBS = -lDPC \
                   ${MODEL_LIBS} ${DP_LIBS} \
                   ${XLIBS} ${LIBRTDEF} \