diff --git a/src/examples/InteractiveStreamingExample/DecodeDASSource.cc b/src/examples/InteractiveStreamingExample/DecodeDASSource.cc
index ea00dddc3..550d115e6 100644
--- a/src/examples/InteractiveStreamingExample/DecodeDASSource.cc
+++ b/src/examples/InteractiveStreamingExample/DecodeDASSource.cc
@@ -21,20 +21,19 @@ DecodeDASSource::~DecodeDASSource() {
 void DecodeDASSource::Open() {
 
     // open the file stream
-    ifs.open(GetName());
-    if (!ifs) throw JException("Unable to open '%s'", GetName().c_str());
+    ifs.open(GetResourceName());
+    if (!ifs) throw JException("Unable to open '%s'", GetResourceName().c_str());
 
 }
 
 void DecodeDASSource::Close() {
     // Close the file/stream here.
-    std::cout << "Closing " << GetName() << std::endl;
+    std::cout << "Closing " << GetResourceName() << std::endl;
     ifs.close();
 }
 
 JEventSource::Result DecodeDASSource::Emit(JEvent& event) {
 
-    // TODO: Put these somewhere that makes sense
     size_t MAX_CHANNELS = 80;
     size_t MAX_SAMPLES  = 1024;
     // open the file stream and parse the data
diff --git a/src/libraries/JANA/Utils/JCpuInfo.cc b/src/libraries/JANA/Utils/JCpuInfo.cc
index 3349a8b9d..6bd72b432 100644
--- a/src/libraries/JANA/Utils/JCpuInfo.cc
+++ b/src/libraries/JANA/Utils/JCpuInfo.cc
@@ -63,10 +63,10 @@ uint32_t GetCpuID() {
 #ifdef __cpuid_count
     GETCPU(cpuid);
 #else  // __cpuid_count
-#warning __cpuid_count is not defined on this system.
+    // cpuid_count is not defined on this system.
+    return 0; 
 #endif // __cpuid_count
     return cpuid;
-    // TODO: Clean this up
 
 #else //__APPLE__
     return sched_getcpu();