diff --git a/ICSharpCode.Decompiler/Metadata/Dom.cs b/ICSharpCode.Decompiler/Metadata/Dom.cs
index ea8255a13..2ec4ac70f 100644
--- a/ICSharpCode.Decompiler/Metadata/Dom.cs
+++ b/ICSharpCode.Decompiler/Metadata/Dom.cs
@@ -882,7 +882,7 @@ namespace ICSharpCode.Decompiler.Metadata
 
 		public FullTypeName GetPrimitiveType(PrimitiveTypeCode typeCode)
 		{
-			return new FullTypeName($"System.{typeCode}");
+			return new TopLevelTypeName("System", typeCode.ToString());
 		}
 
 		public FullTypeName GetSZArrayType(FullTypeName elementType)
diff --git a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
index 05e2d0833..e06d67ce4 100644
--- a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
@@ -506,7 +506,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 				return this;
 			} else {
 				return new SpecializingDecompilerTypeSystem(this, substitution);
-	}
+			}
 		}
 	}
 }
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeSpecification.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeSpecification.cs
index 41deb9089..fa5799020 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeSpecification.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeSpecification.cs
@@ -237,12 +237,12 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 
 		public ITypeReference GetGenericMethodParameter(Unit genericContext, int index)
 		{
-			return new TypeParameterReference(SymbolKind.Method, index);
+			return TypeParameterReference.Create(SymbolKind.Method, index);
 		}
 
 		public ITypeReference GetGenericTypeParameter(Unit genericContext, int index)
 		{
-			return new TypeParameterReference(SymbolKind.TypeDefinition, index);
+			return TypeParameterReference.Create(SymbolKind.TypeDefinition, index);
 		}
 
 		public ITypeReference GetModifiedType(ITypeReference modifier, ITypeReference unmodifiedType, bool isRequired)