diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPanel.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPanel.java
index 5319fd716..e4af3f7ae 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPanel.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPanel.java
@@ -230,9 +230,11 @@ public class GenericOrganizationalUnitPanel extends CompoundContentItemPanel {
             Element addressElem = contactElem.newChildElement(
                     "address");
             Element postalCode = addressElem.newChildElement(
-                    "postalCode");
+                    "postalCode");            
             postalCode.setText(address.getPostalCode());
-            Element data = addressElem.newChildElement("data");
+            Element city = addressElem.newChildElement("city");
+            city.setText(address.getCity());
+            Element data = addressElem.newChildElement("address");
             data.setText(address.getAddress());
             Element country = addressElem.newChildElement("country");
             country.setText(address.getIsoCountryCode());
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java
index 46fdf09cb..5f24d88d0 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java
@@ -19,7 +19,6 @@ package com.arsdigita.london.navigation.cms;
 
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentItemXMLRenderer;
-import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.london.navigation.DataCollectionRenderer;
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java
index e138ddd47..ea5ac164f 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java
@@ -34,7 +34,6 @@ import com.arsdigita.cms.contenttypes.SciProject;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.domain.DomainObject;
-import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.xml.Element;