diff --git a/ChangeLog b/ChangeLog
index e6ab8dc17..32075d7f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/GSTLS.m:
+        * Source/NSNotificationCenter.m:
+        * Source/NSPropertyList.m:
+        Tweaks to avoid compiler warnings spotted by Fred.
+
 2012-12-06  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Source/NSHTTPCookieStorage.m: Don't read store if it doesn't exist.
diff --git a/Source/GSTLS.m b/Source/GSTLS.m
index 6f63e496f..a2d8aab4a 100644
--- a/Source/GSTLS.m
+++ b/Source/GSTLS.m
@@ -1533,8 +1533,8 @@ static NSMutableDictionary      *credentialsCache = nil;
       case GNUTLS_CRD_CERTIFICATE:       /* certificate authentication */
       {
         unsigned int            cert_list_size = 0;
-        const gnutls_datum      *cert_list;
-        gnutls_x509_crt         cert;
+        const gnutls_datum_t    *cert_list;
+        gnutls_x509_crt_t       cert;
 
         /* Check if we have been using ephemeral Diffie-Hellman.
          */
diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m
index 61c7c80e7..2992edb0c 100644
--- a/Source/NSNotificationCenter.m
+++ b/Source/NSNotificationCenter.m
@@ -32,6 +32,7 @@
 #import "common.h"
 #define	EXPOSE_NSNotificationCenter_IVARS	1
 #import "Foundation/NSNotification.h"
+#import "Foundation/NSDictionary.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSLock.h"
 #import "Foundation/NSThread.h"
diff --git a/Source/NSPropertyList.m b/Source/NSPropertyList.m
index 60b115add..c6f1247f9 100644
--- a/Source/NSPropertyList.m
+++ b/Source/NSPropertyList.m
@@ -2303,18 +2303,10 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
     }
   else
     {
-      NSString	*cls;
-
-      if (obj == nil)
+      if (nil == obj)
 	{
 	  obj = @"(nil)";
-	  cls = @"(nil)";
 	}
-      else
-	{
-	  cls = NSStringFromClass([obj class]);
-	}
-
       if (x == NSPropertyListXMLFormat_v1_0)
 	{
 	  [dest appendBytes: "<string>" length: 8];