diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09e6c25b..5280e24e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(${SPARTA_INCLUDE_DIRS})
 # Set up STF library
 set (STF_LIB_BASE ${PROJECT_SOURCE_DIR}/stf_lib)
 set (DISABLE_STF_DOXYGEN ON)
+set (DISABLE_STF_TESTS ON)
 
 if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
   set (FULL_LTO true)
diff --git a/core/VectorUopGenerator.cpp b/core/VectorUopGenerator.cpp
index 8061a9c3..a73c6e54 100644
--- a/core/VectorUopGenerator.cpp
+++ b/core/VectorUopGenerator.cpp
@@ -25,11 +25,10 @@ namespace olympia
         // Does the instruction have tail elements?
         const uint32_t num_elems = current_VCSRs->vl / current_VCSRs->sew;
         inst->setTail(num_elems < current_VCSRs->vlmax);
-
         if(num_uops_to_generate_ > 1)
         {
             // Original instruction will act as the first UOp
-            inst->setUOpID(0); // set UOpID()   
+            inst->setUOpID(0); // set UOpID()
             current_inst_ = inst;
             current_inst_->setUOpCount(num_uops_to_generate_);
             ILOG("Inst: " << current_inst_ << " is being split into " << num_uops_to_generate_ << " UOPs");
@@ -106,4 +105,4 @@ namespace olympia
             reset_();
         }
     }
-} // namespace olympia
+} // namespace olympia
\ No newline at end of file
diff --git a/stf_lib b/stf_lib
index 69d48b1b..b874cc0c 160000
--- a/stf_lib
+++ b/stf_lib
@@ -1 +1 @@
-Subproject commit 69d48b1bab14a410c859aa3591b4eb175323ec98
+Subproject commit b874cc0c8dc6a7e95fe00c2f9cd8e4504270d395