diff --git a/ccm-core/web/error/error-code.jsp b/ccm-core/web/error/error-code.jsp
index 38bcd3f89..de3d9b383 100755
--- a/ccm-core/web/error/error-code.jsp
+++ b/ccm-core/web/error/error-code.jsp
@@ -1,6 +1,6 @@
 <%@page isErrorPage="true"
         import="com.arsdigita.kernel.Kernel,
-                com.arsdigita.sitenode.ServletErrorReport"
+                com.arsdigita.web.ServletErrorReport"
 %>
 
 <pre>
diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources.properties b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources.properties
index 29ef6aa89..f4c362aea 100644
--- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources.properties
+++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources.properties
@@ -19,3 +19,4 @@ term.domain.mapping.ui.application=Application
 term.domain.ui.released.label=Released
 term.domain.mapping.ui.context=Context
 term.domain.ui.mappings=Mappings
+term.domain.ui.basic_properties=Basic Properties
diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources_de.properties b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources_de.properties
index fd157bfdb..ddb26a265 100644
--- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources_de.properties
+++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/TermResources_de.properties
@@ -19,3 +19,4 @@ term.domain.mapping.ui.application=Applikation
 term.domain.ui.released.label=Freigegeben
 term.domain.mapping.ui.context=Kontext
 term.domain.ui.mappings=Mappings
+term.domain.ui.basic_properties=Basiseigenschaften
diff --git a/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties b/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
index 15e4c5fb6..848822168 100644
--- a/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
+++ b/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
@@ -24,3 +24,4 @@ subsite.ui.hostname_already_in\ use=The hostname {0} is already used by another
 subsite.ui.edit=Edit
 subsite.ui.delete=Delete
 subsite.ui.delete.confirm=Are you sure to delete the subsite {0}?
+subsite.ui.no_subsites=No subites defined
diff --git a/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties b/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
index 981afb477..c03bcff78 100644
--- a/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
+++ b/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
@@ -24,3 +24,4 @@ subsite.ui.hostname_already_in\ use=Der Hostname {0} wird bereits von einer ande
 subsite.ui.edit=Bearbeiten
 subsite.ui.delete=L\u00f6schen
 subsite.ui.delete.confirm=Sind Sie sicher, dass Sie die Subsite {0} l\u00f6schen wollen?
+subsite.ui.no_subsites=Es sind keine Subsites eingerichtet.