diff --git a/ChangeLog b/ChangeLog
index 97dc800f692103bbb0c363e91a9785f17138d1f5..d12c1b3600bad21759391dbd8869cad3676012b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 20 18:16:53 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xm_internal.c: Fix 2 misleading comments & potential
+	NULL deference
+
 Tue Jan 20 17:46:53 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/remote_internal.c: Remove a use of strerror() in error
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 726e39d82949833ad3338ec36dbb4faef717be7f..b944b979cf0edffbabb343925d3bfa3d6b695ae6 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -559,10 +559,10 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) {
 
 
 /*
- * Open a 'connection' to the config file directory ;-)
- * We just create a hash table to store config files in.
- * We only support a single directory, so repeated calls
- * to open all end up using the same cache of files
+ * The XM driver keeps a cache of config files as virDomainDefPtr
+ * objects in the xenUnifiedPrivatePtr. Optionally inotify lets
+ * us watch for changes (see separate driver), otherwise we poll
+ * every few seconds
  */
 virDrvOpenStatus
 xenXMOpen (virConnectPtr conn,
@@ -591,8 +591,8 @@ xenXMOpen (virConnectPtr conn,
 }
 
 /*
- * Free the config files in the cache if this is the
- * last connection
+ * Free the cached config files associated with this
+ * connection
  */
 int xenXMClose(virConnectPtr conn) {
     xenUnifiedPrivatePtr priv = conn->privateData;
@@ -1290,7 +1290,7 @@ no_memory:
  * domain, suitable for later feeding for virDomainCreateXML
  */
 char *xenXMDomainDumpXML(virDomainPtr domain, int flags) {
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv;
     const char *filename;
     xenXMConfCachePtr entry;