diff --git a/src/sst/elements/vanadis/os/include/process.h b/src/sst/elements/vanadis/os/include/process.h
index b5ca675f6d..a2ba9d3543 100644
--- a/src/sst/elements/vanadis/os/include/process.h
+++ b/src/sst/elements/vanadis/os/include/process.h
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include <sys/mman.h>
-//#include <iostream>
+#include <iostream>
 //#include <fstream>
 
 #include <cstdint>
@@ -183,7 +183,7 @@ class ProcessInfo {
         assert( 1 == fscanf(fp,"hw_thread_: %" SCNu32 "\n",&hw_thread_) );
         output->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread_: %" PRIu32 "\n",hw_thread_);
 
-        assert( 1 == fscanf(fp,"thread_id_address: %" SCNx64 "\n",&thread_id_address_) );
+        assert( 1 == fscanf(fp,"thread_id_address_: %" SCNx64 "\n",&thread_id_address_) );
         output->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"thread_id_address: %#" PRIx64 "\n",thread_id_address_);
 
         virtual_memory_map_ = new VirtMemMap(output,fp,phys_mem_mgr,elf_info);
diff --git a/src/sst/elements/vanadis/os/include/virtMemMap.cc b/src/sst/elements/vanadis/os/include/virtMemMap.cc
index e289aa06c6..d49c41fd73 100644
--- a/src/sst/elements/vanadis/os/include/virtMemMap.cc
+++ b/src/sst/elements/vanadis/os/include/virtMemMap.cc
@@ -249,7 +249,7 @@ MemoryRegion::MemoryRegion( SST::Output* output, FILE* fp, PhysMemManager* mem_m
 
     for ( auto i = 0; i < size; i++ ) {
         int vpn,ppn,ref_cnt;
-        assert( 3 == fscanf(fp,"vpn: %d, ppn: %d, refCnt: %d\n", &vpn, &ppn, &ref_cnt ) );
+        assert( 3 == fscanf(fp,"vpn: %d, ppn: %d, ref_cnt: %d\n", &vpn, &ppn, &ref_cnt ) );
         output->verbose(CALL_INFO, 0, VANADIS_DBG_SNAPSHOT,"vpn: %d, ppn: %d, refCnt: %d\n", vpn, ppn, ref_cnt );
         virt_to_phys_page_map_[vpn] = new OS::Page( mem_manager, ppn, ref_cnt );
     }
diff --git a/src/sst/elements/vanadis/os/vnodeos.cc b/src/sst/elements/vanadis/os/vnodeos.cc
index 7f94af6e04..a3f81f6200 100644
--- a/src/sst/elements/vanadis/os/vnodeos.cc
+++ b/src/sst/elements/vanadis/os/vnodeos.cc
@@ -33,6 +33,8 @@
 #include "utils.h"
 #include "sst/elements/mmu/utils.h"
 
+#include <iostream>
+
 using namespace SST::Vanadis;
 
 VanadisNodeOSComponent::VanadisNodeOSComponent(SST::ComponentId_t id, SST::Params& params)
@@ -343,7 +345,6 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
     std::stringstream filename;
     filename << checkpoint_dir_ << "/" << getName();
     output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"Checkpoint component `%s` %s\n",getName().c_str(), filename.str().c_str());
-
     auto fp = fopen(filename.str().c_str(),"r");
     assert(fp);
 
@@ -409,13 +410,13 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
         output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"core: %" PRIu32 "\n",core);
         assert( core == i );
 
-        assert( 1 == fscanf(fp,"hw_thread_map_.size(): %zd\n",&size) );
+        assert( 1 == fscanf(fp,"m_hwThreadMap.size(): %zd\n",&size) );
         output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread_map_.size(): %zu\n",size);
 
         for ( auto j = 0; j < size; j++ ) {
             uint32_t hw_thread;
             // hw_thread: 0
-            assert( 1 == fscanf(fp, "hw_thread: %" SCNu32 "\n",&hw_thread) );
+            assert( 1 == fscanf(fp, "hwThread: %" SCNu32 "\n",&hw_thread) );
             output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread: %" PRIu32 "\n",hw_thread);
             assert( hw_thread == j );
             uint32_t pid,tid;
@@ -433,7 +434,6 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
         char str [80];
         assert( 1 == fscanf(fp,"filename: %s\n",str));
         output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"filename: %s\n",str);
-
         auto & page_map = elf_page_cache_[ elf_map_[str] ];
 
         size_t size2;