diff --git a/.editorconfig b/.editorconfig
index 9e10931d0..d64f74bc1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,7 +25,7 @@ dotnet_sort_system_directives_first = true
 dotnet_separate_import_directive_groups = true
 
 [*.cs]
-csharp_new_line_before_open_brace = true
+csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
diff --git a/src/runtime/extensiontype.cs b/src/runtime/extensiontype.cs
index 693a46f42..6585180c1 100644
--- a/src/runtime/extensiontype.cs
+++ b/src/runtime/extensiontype.cs
@@ -38,6 +38,7 @@ public ExtensionType()
 
             Runtime.PyObject_GC_UnTrack(py);
 
+            // Steals a ref to tpHandle.
             tpHandle = tp;
             pyHandle = py;
             gcHandle = gc;
@@ -50,7 +51,7 @@ public ExtensionType()
         public static void FinalizeObject(ManagedType self)
         {
             Runtime.PyObject_GC_Del(self.pyHandle);
-            Runtime.XDecref(self.tpHandle);
+            // Not necessary for decref of `tpHandle`.
             self.gcHandle.Free();
         }
 
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
index 8853c2d5e..5af2e1a7e 100644
--- a/src/runtime/metatype.cs
+++ b/src/runtime/metatype.cs
@@ -266,6 +266,7 @@ private static IntPtr DoInstanceCheck(IntPtr tp, IntPtr args, bool checkType)
                 return Runtime.PyFalse;
             }
 
+            Runtime.XIncref(args);
             using (var argsObj = new PyList(args))
             {
                 if (argsObj.Length() != 1)
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
index 295a63b3d..8a6a24799 100644
--- a/src/runtime/pythonexception.cs
+++ b/src/runtime/pythonexception.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 
 namespace Python.Runtime
 {
@@ -190,5 +191,21 @@ public static bool Matches(IntPtr ob)
         {
             return Runtime.PyErr_ExceptionMatches(ob) != 0;
         }
+
+        public static void ThrowIfIsNull(IntPtr ob)
+        {
+            if (ob == IntPtr.Zero)
+            {
+                throw new PythonException();
+            }
+        }
+
+        public static void ThrowIfIsNotZero(int value)
+        {
+            if (value != 0)
+            {
+                throw new PythonException();
+            }
+        }
     }
 }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
index 7a78cd6e1..63e8f135a 100644
--- a/src/runtime/runtime.cs
+++ b/src/runtime/runtime.cs
@@ -1340,6 +1340,10 @@ internal static IntPtr PyUnicode_FromStringAndSize(IntPtr value, long size)
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr PyUnicode_FromStringAndSize(IntPtr value, IntPtr size);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern IntPtr PyUnicode_AsUTF8(IntPtr unicode);
+
 #elif PYTHON2
         internal static IntPtr PyString_FromStringAndSize(string value, long size)
         {
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
index 9a98e9ebb..6ca3fed9b 100644
--- a/src/runtime/typemanager.cs
+++ b/src/runtime/typemanager.cs
@@ -415,12 +415,8 @@ internal static IntPtr AllocateTypeObject(string name)
             // the Python version of the type name - otherwise we'd have to
             // allocate the tp_name and would have no way to free it.
 #if PYTHON3
-            // For python3 we leak two objects. One for the ASCII representation
-            // required for tp_name, and another for the Unicode representation
-            // for ht_name.
-            IntPtr temp = Runtime.PyBytes_FromString(name);
-            IntPtr raw = Runtime.PyBytes_AS_STRING(temp);
-            temp = Runtime.PyUnicode_FromString(name);
+            IntPtr temp = Runtime.PyUnicode_FromString(name);
+            IntPtr raw = Runtime.PyUnicode_AsUTF8(temp);
 #elif PYTHON2
             IntPtr temp = Runtime.PyString_FromString(name);
             IntPtr raw = Runtime.PyString_AsString(temp);