diff --git a/ChangeLog b/ChangeLog
index 1487dfa10..e982221cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19  Mike Kestner  <mkestner@speakeasy.net>
+
+	* generator/GenBase.cs : mark #line 1 for .customs
+	* generator/SignalHandler.cs : fix for GObj retvals
+
 2003-02-18  Mark Crichton  <crichton@gimp.org>
 
 	* generator/EnumGen.cs: Handle different enum types.
diff --git a/generator/GenBase.cs b/generator/GenBase.cs
index 12223b577..328a7b98c 100644
--- a/generator/GenBase.cs
+++ b/generator/GenBase.cs
@@ -99,6 +99,7 @@ namespace GtkSharp.Generation {
 			char sep = Path.DirectorySeparatorChar;
 			string custom = ".." + sep + NS.ToLower() + sep + Name + ".custom";
 			if (File.Exists(custom)) {
+				sw.WriteLine ("#line 1 " + Name + ".custom");
 				sw.WriteLine ("#region Customized extensions");
 				FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
 				StreamReader sr = new StreamReader(custstream);
diff --git a/generator/SignalHandler.cs b/generator/SignalHandler.cs
index db764c669..858e9108e 100644
--- a/generator/SignalHandler.cs
+++ b/generator/SignalHandler.cs
@@ -109,7 +109,7 @@ namespace GtkSharp.Generation {
 			sw.WriteLine();
 			sw.WriteLine("\t\tprivate static " + dname + " _Delegate;");
 			sw.WriteLine();
-			sw.Write("\t\tprivate static " + s_ret + " ");
+			sw.Write("\t\tprivate static " + p_ret + " ");
 			sw.WriteLine(cbname + "(" + pinv + ", int key)");
 			sw.WriteLine("\t\t{");
 			sw.WriteLine("\t\t\tif (!_Instances.Contains(key))");
@@ -157,7 +157,7 @@ namespace GtkSharp.Generation {
 					else
 						sw.WriteLine ("\t\t\t\tthrow new Exception(\"args.RetVal unset in callback\");");
 
-					sw.WriteLine("\t\t\treturn (" + s_ret + ") args.RetVal;");
+					sw.WriteLine("\t\t\treturn (" + p_ret + ") " + SymbolTable.CallByName (retval, "args.RetVal") + ";");
 				}
 				sw.WriteLine("\t\t}");
 				sw.WriteLine();