diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java
index 483cc92fe..678cb960c 100644
--- a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java
+++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java
@@ -202,7 +202,7 @@ public class Component extends CcmObject implements Serializable {
                                                 + "attributeString  = \"%s\", "
                                                 + "active = %b, "
                                                 + "parentComponent = %s, "
-                                                + "componentOrder, "
+                                                + "componentOrder = %d, "
                                                 + "selected = %b%s",
                                             adminName,
                                             Objects.toString(description),
diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java
index 73517da7b..a434e5566 100644
--- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java
+++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java
@@ -81,13 +81,13 @@ public class ConfirmEmailListener
             return false;
         }
 
-        if (!Objects.equals(this.fromEmail, other.fromEmail)) {
+        if (!Objects.equals(this.fromEmail, other.getFromEmail())) {
             return false;
         }
-        if (!Objects.equals(this.subject, other.subject)) {
+        if (!Objects.equals(this.subject, other.getSubject())) {
             return false;
         }
-        return Objects.equals(this.body, other.body);
+        return Objects.equals(this.body, other.getBody());
     }
 
     @Override
@@ -98,7 +98,7 @@ public class ConfirmEmailListener
     @Override
     public String toString(final String data) {
         return super.toString(String.format(", fromEmail = \"%s\","
-                                                    + "subject = \"%s\", ",
+                                                    + "subject = \"%s\"%s",
                                             fromEmail,
                                             subject,
                                             data));
diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java
index 7f954e150..288e3056e 100644
--- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java
+++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java
@@ -6,12 +6,15 @@
 package org.libreccm.formbuilder.actions;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import org.hibernate.annotations.CollectionId;
+
 import org.libreccm.formbuilder.ProcessListener;
 
+import java.util.Objects;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -19,12 +22,14 @@ import org.libreccm.formbuilder.ProcessListener;
 @Entity
 @Table(name = "formbuilder_simple_email_listeners")
 public class SimpleEmailListener
-        extends ProcessListener
-        implements Serializable {
-    
+    extends ProcessListener
+    implements Serializable {
+
+    private static final long serialVersionUID = -5004346250775992079L;
+
     @Column(name = "recipient")
     private String recipient;
-    
+
     @Column(name = "subject")
     private String subject;
 
@@ -44,6 +49,45 @@ public class SimpleEmailListener
         this.subject = subject;
     }
 
-    
-    
+    @Override
+    public int hashCode() {
+        int hash = super.hashCode();
+        hash = 67 * hash + Objects.hashCode(recipient);
+        hash = 67 * hash + Objects.hashCode(subject);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final SimpleEmailListener other = (SimpleEmailListener) obj;
+        if (!other.canEqual(this)) {
+            return false;
+        }
+
+        if (!Objects.equals(recipient, other.getRecipient())) {
+            return false;
+        }
+        return Objects.equals(subject, other.getSubject());
+    }
+
+    @Override
+    public boolean canEqual(final Object obj) {
+        return obj instanceof SimpleEmailListener;
+    }
+
+    @Override
+    public String toString(final String data) {
+        return super.toString(String.format(", recipient = \"%s\", "
+                                                + "subject = \"%s\"%s",
+                                            recipient,
+                                            subject,
+                                            data));
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlListener.java
deleted file mode 100644
index e85ccd7db..000000000
--- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.libreccm.formbuilder.actions;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import org.libreccm.formbuilder.ProcessListener;
-
-/**
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-@Entity
-@Table(name = "formbuilder_xml_listeners")
-public class XmlListener extends ProcessListener implements Serializable {
-
-    private static final long serialVersionUID = -8674849210363260180L;
-    
-    @Override
-    public boolean canEqual(final Object obj) {
-        return obj instanceof XmlListener;
-    }
-
-}
diff --git a/ccm-core/src/main/java/org/libreccm/web/Host.java b/ccm-core/src/main/java/org/libreccm/web/Host.java
index dfe9d8c80..b98808a69 100644
--- a/ccm-core/src/main/java/org/libreccm/web/Host.java
+++ b/ccm-core/src/main/java/org/libreccm/web/Host.java
@@ -110,6 +110,7 @@ public class Host implements Serializable {
                                  + "serverName = \"%s\", "
                                  + "serverPort  =\"%s\""
                                  + " }",
+                             super.toString(),
                              hostId,
                              serverName,
                              serverPort);
diff --git a/ccm-core/src/test/java/org/libreccm/core/EntitiesTestCore.java b/ccm-core/src/test/java/org/libreccm/core/EntitiesTestCore.java
index eb035e318..deb85d2ac 100644
--- a/ccm-core/src/test/java/org/libreccm/core/EntitiesTestCore.java
+++ b/ccm-core/src/test/java/org/libreccm/core/EntitiesTestCore.java
@@ -29,4 +29,10 @@ public class EntitiesTestCore {
                 .withRedefinedSuperclass()
                 .verify();
     }
+//    
+//    @Test
+//    public void verifyToString() {
+//        
+//    }
+    
 }