diff --git a/isis/src/base/objs/CSMCamera/CSMCamera.h b/isis/src/base/objs/CSMCamera/CSMCamera.h
index 14756482ff270b4c3681c731cdc446cbdc2294cd..2d3bffb4f3760c04b495ab6160abebdbbce05c46 100644
--- a/isis/src/base/objs/CSMCamera/CSMCamera.h
+++ b/isis/src/base/objs/CSMCamera/CSMCamera.h
@@ -147,9 +147,6 @@ namespace Isis {
 
       csm::RasterGM *m_model; //! CSM sensor model
       iTime m_refTime; //! The reference time that all model image times are relative to
-      SpiceRotation *m_bodyRotation = NULL; //!< Body spice rotation
-      SpiceRotation *m_instrumentRotation = NULL; //!< Instrument spice rotation
-      Longitude *m_solarLongitude = NULL;
 
       void isisToCsmPixel(double line, double sample, csm::ImageCoord &csmPixel) const;
       void csmToIsisPixel(csm::ImageCoord csmPixel, double &line, double &sample) const;
diff --git a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
index 19b3306fa7d7261db82b3c2460922cd6ea1917cc..3ef47feecca71574a5788bbdfeee9e02e6984c09 100644
--- a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
+++ b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
@@ -471,7 +471,6 @@ namespace Isis {
     if (!isValid()) {
       return;
     }
-    int tri = 0;
     Triangle *triangles = (Triangle *)rtcSetNewGeometryBuffer(rtcMesh, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, sizeof(Triangle), numberOfPolygons());
     // Add the body's face (vertex indices) to the Embree device's index buffer
     for (int t = 0; t < numberOfPolygons(); ++t) {
diff --git a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h
index bdc3a48c319250d76f9247e79eb2d5d6c1edd416..8e7a32b64e3e7635c87941c3d991f02668bc76f6 100644
--- a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h
+++ b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h
@@ -748,13 +748,18 @@ namespace Isis {
        *
        * @internal
        */
-      class ProcessIterator : public std::iterator<
-          std::forward_iterator_tag, int> {
+      class ProcessIterator {
         public:
           ProcessIterator(int position);
           ProcessIterator(const ProcessIterator &other);
           virtual ~ProcessIterator();
 
+          using value_type = int;
+          using iterator_category = std::forward_iterator_tag;
+          using difference_type = std::ptrdiff_t;
+          using pointer = int*;
+          using reference = int&;
+
           ProcessIterator &operator++();
 
           /**
diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp
index ec039a1bbf6d2b25161a7fece88538fc8c26df17..d20c81f30ecea9b5e80c2af82002e24db2fcaa17 100644
--- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp
+++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp
@@ -52,7 +52,7 @@ namespace Isis {
 
   void tgocassisstitch(UserInterface &ui) {
 
-    QMap<QString, FileName> frameMap;
+    QMultiMap<QString, FileName> frameMap;
 
     try {
       // Open up the list of framelet files
@@ -128,7 +128,7 @@ namespace Isis {
                             frameletList.fileName(i) );
     }
 
-    return frameMap;
+    return std::move(frameMap);
   }