diff --git a/Source/Common/MemoryCommon.cpp b/Source/Common/MemoryCommon.cpp
index e83d623f..987fe817 100644
--- a/Source/Common/MemoryCommon.cpp
+++ b/Source/Common/MemoryCommon.cpp
@@ -104,7 +104,8 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
     break;
   }
 
-  char* buffer = new char[getSizeForType(type, length)];
+  size_t size = getSizeForType(type, length);
+  char* buffer = new char[size];
 
   switch (type)
   {
@@ -141,7 +142,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
       theByte = static_cast<u8>(theByteInt);
     }
 
-    std::memcpy(buffer, &theByte, sizeof(u8));
+    std::memcpy(buffer, &theByte, size);
     actualLength = sizeof(u8);
     break;
   }
@@ -177,7 +178,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
       }
     }
 
-    std::memcpy(buffer, &theHalfword, sizeof(u16));
+    std::memcpy(buffer, &theHalfword, size);
     actualLength = sizeof(u16);
     break;
   }
@@ -213,7 +214,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
       }
     }
 
-    std::memcpy(buffer, &theWord, sizeof(u32));
+    std::memcpy(buffer, &theWord, size);
     actualLength = sizeof(u32);
     break;
   }
@@ -230,7 +231,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
       returnCode = MemOperationReturnCode::invalidInput;
       return buffer;
     }
-    std::memcpy(buffer, &theFloat, sizeof(float));
+    std::memcpy(buffer, &theFloat, size);
     actualLength = sizeof(float);
     break;
   }
@@ -247,7 +248,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
       returnCode = MemOperationReturnCode::invalidInput;
       return buffer;
     }
-    std::memcpy(buffer, &theDouble, sizeof(double));
+    std::memcpy(buffer, &theDouble, size);
     actualLength = sizeof(double);
     break;
   }
@@ -300,7 +301,7 @@ char* formatStringToMemory(MemOperationReturnCode& returnCode, size_t& actualLen
     }
 
     int index = 0;
-    for (auto i : bytes)
+    for (const auto& i : bytes)
     {
       std::stringstream byteStream(i);
       ss >> std::hex;
diff --git a/Source/GUI/MemViewer/MemViewer.cpp b/Source/GUI/MemViewer/MemViewer.cpp
index dff02e7f..c43333dc 100644
--- a/Source/GUI/MemViewer/MemViewer.cpp
+++ b/Source/GUI/MemViewer/MemViewer.cpp
@@ -18,10 +18,6 @@ MemViewer::MemViewer(QWidget* parent) : QAbstractScrollArea(parent)
 {
   initialise();
 
-  std::fill(m_memoryMsElapsedLastChange, m_memoryMsElapsedLastChange + m_numCells, 0);
-  updateMemoryData();
-  std::memcpy(m_lastRawMemoryData, m_updatedRawMemoryData, m_numCells);
-
   setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
   changeMemoryRegion(false);
   verticalScrollBar()->setPageStep(m_numRows);
@@ -49,6 +45,10 @@ void MemViewer::initialise()
   m_memViewStart = Common::MEM1_START;
   m_memViewEnd = Common::MEM1_END;
   m_currentFirstAddress = m_memViewStart;
+
+  std::fill(m_memoryMsElapsedLastChange, m_memoryMsElapsedLastChange + m_numCells, 0);
+  updateMemoryData();
+  std::memcpy(m_lastRawMemoryData, m_updatedRawMemoryData, m_numCells);
 }
 
 QSize MemViewer::sizeHint() const