diff --git a/libraries/gpu/src/gpu/Texture_ktx.cpp b/libraries/gpu/src/gpu/Texture_ktx.cpp
index f8a43bdb5b..78822ce9d7 100644
--- a/libraries/gpu/src/gpu/Texture_ktx.cpp
+++ b/libraries/gpu/src/gpu/Texture_ktx.cpp
@@ -64,19 +64,16 @@ struct GPUKTXPayload {
     void serialize(DataSerializer &ser) {
 
         ser << CURRENT_VERSION;
-        ser.addPadding(1);
 
         ser << _samplerDesc;
 
         uint32_t usageData = (uint32_t)_usage._flags.to_ulong();
         ser << usageData;
         ser << ((uint8_t)_usageType);
-        ser.addPadding(1);
         ser << _originalSize;
 
+        ser.addPadding(PADDING);
 
-        // The +1 is here because we're adding the CURRENT_VERSION at the top, but since it's declared as a static
-        // const, it's not actually part of the class' size.
         assert(ser.length() == GPUKTXPayload::SIZE);
     }
 
@@ -109,7 +106,7 @@ struct GPUKTXPayload {
         dsr >> _samplerDesc;
 
         dsr >> usageData;
-        _usage._flags = gpu::Texture::Usage::Flags(usageData);
+        _usage = gpu::Texture::Usage(usageData);
 
         dsr >> usagetype;
         dsr.skipPadding(1);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 6ad2534038..69a593ed09 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1949,9 +1949,7 @@ void Blender::run() {
         blendedMeshSizes.push_back(numVertsInMesh);
 
         // initialize offsets to zero
-        for(BlendshapeOffsetUnpacked &bou : unpackedBlendshapeOffsets) {
-            bou.clear();
-        }
+        memset(unpackedBlendshapeOffsets.data(), 0, numVertsInMesh * sizeof(BlendshapeOffsetUnpacked));
 
         // for each blendshape in this mesh, accumulate the offsets into unpackedBlendshapeOffsets.
         const float NORMAL_COEFFICIENT_SCALE = 0.01f;
diff --git a/libraries/shared/src/SerDes.h b/libraries/shared/src/SerDes.h
index 9de547313f..f80d09a60a 100644
--- a/libraries/shared/src/SerDes.h
+++ b/libraries/shared/src/SerDes.h
@@ -105,7 +105,7 @@ class DataSerializer {
          *
          * Since this is mostly intended to be used for networking, we default to the largest probable MTU here.
          */
-        static const int  DEFAULT_SIZE = 1500;
+        static const int DEFAULT_SIZE = 1500;
 
         /**
          * @brief Character to use for padding.
@@ -113,7 +113,7 @@ class DataSerializer {
          * Padding should be ignored, so it doesn't matter what we go with here, but it can be useful to set it
          * to something that would be distinctive in a dump.
          */
-        static const char PADDING_CHAR = 0xAA;
+        static const char PADDING_CHAR = (char)0xAA;
 
         /**
          * @brief Construct a dynamically allocated serializer