diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
index 32a96dc184..4f5c57bd45 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
@@ -1277,7 +1277,7 @@ void Architecture::parseCompilerConfig(DocumentStorage &store)
 
   uint4 elemId = decoder.openElement(ELEM_COMPILER_SPEC);
   for(;;) {
-    uint subId = decoder.peekElement();
+    uint4 subId = decoder.peekElement();
     if (subId == 0) break;
     if (subId == ELEM_DEFAULT_PROTO)
       decodeDefaultProto(decoder);
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
index c4f1483548..ed28d80f71 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
@@ -3185,7 +3185,7 @@ void ProtoStoreInternal::decode(Decoder &decoder,ProtoModel *model)
 
   uint4 elemId = decoder.openElement(ELEM_INTERNALLIST);
   for(;;) { // This is only the input params
-    uint subId = decoder.openElement();		// <retparam> or <param>
+    uint4 subId = decoder.openElement();		// <retparam> or <param>
     if (subId == 0) break;
     string name;
     uint4 flags = 0;
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
index 552535978f..eb40eed462 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
@@ -3753,7 +3753,7 @@ void TypeFactory::decodeCoreTypes(Decoder &decoder)
 void TypeFactory::decodeDataOrganization(Decoder &decoder)
 
 {
-  uint elemId = decoder.openElement(ELEM_DATA_ORGANIZATION);
+  uint4 elemId = decoder.openElement(ELEM_DATA_ORGANIZATION);
   for(;;) {
     uint4 subId = decoder.openElement();
     if (subId == 0) break;