diff --git a/ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs b/ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs
index d396af93b..8b3adddb8 100644
--- a/ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs
+++ b/ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs
@@ -533,10 +533,10 @@ namespace ICSharpCode.Decompiler.Ast
 						}
 						return arg1;
 					}
-					case ILCode.Conv_Ovf_I:     return arg1.CastTo(typeof(IntPtr)); // TODO
-					case ILCode.Conv_Ovf_U:     return arg1.CastTo(typeof(UIntPtr));
-					case ILCode.Conv_Ovf_I_Un:  return arg1.CastTo(typeof(IntPtr));
-					case ILCode.Conv_Ovf_U_Un:  return arg1.CastTo(typeof(UIntPtr));
+					case ILCode.Conv_Ovf_I:     return arg1.CastTo(new SimpleType("IntPtr")); // TODO
+					case ILCode.Conv_Ovf_U:     return arg1.CastTo(new SimpleType("UIntPtr"));
+					case ILCode.Conv_Ovf_I_Un:  return arg1.CastTo(new SimpleType("IntPtr"));
+					case ILCode.Conv_Ovf_U_Un:  return arg1.CastTo(new SimpleType("UIntPtr"));
 					case ILCode.Castclass:      return arg1.CastTo(operandAsTypeRef);
 				case ILCode.Unbox_Any:
 					// unboxing does not require a cast if the argument was an isinst instruction
diff --git a/ILSpy/Properties/app.config.template b/ILSpy/Properties/app.config.template
index c8c1f21c7..259ff0be9 100644
--- a/ILSpy/Properties/app.config.template
+++ b/ILSpy/Properties/app.config.template
@@ -6,7 +6,7 @@
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<!-- The redirects allow using AddIns with a different ILSpy version than they were compiled against. -->
-			<!-- No guarantee they'll work correctly, though. -->
+			<!-- No guarantee they'll work correctly, though (there might be breaking API changes in ILSpy). -->
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.TreeView" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>
 				<bindingRedirect oldVersion="4.1.0.0-99.9.9.9" newVersion="4.1.0.7275"/>
@@ -17,15 +17,15 @@
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.NRefactory" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>
-				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.2"/>
+				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.4"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.NRefactory.CSharp" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>
-				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.2"/>
+				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.4"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.NRefactory.VB" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>
-				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.2"/>
+				<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.4"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.Decompiler" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>