diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 663cfd150..fc7c646c4 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -142,8 +142,9 @@
 -define(INVALID_FROM, exmpp_stream:error('invalid-from')).
 
 -define(STANZA_ERROR(NS, Condition),
-  exmpp_xml:xmlel_to_xmlelement(exmpp_stanza:error(NS, Condition),
-    [?NS_JABBER_CLIENT], [{?NS_XMPP, "stream"}])).
+%  exmpp_xml:xmlel_to_xmlelement(exmpp_stanza:error(NS, Condition),
+%    [?NS_JABBER_CLIENT], [{?NS_XMPP, "stream"}])).
+  exmpp_stanza:error(NS, Condition)).
 -define(ERR_FEATURE_NOT_IMPLEMENTED(NS),
   ?STANZA_ERROR(NS, 'feature-not-implemented')).
 
diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index a9f6b7d0c..952beca8d 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -496,7 +496,9 @@ extract_user_info(offline, Username, Host) ->
 	    case Els of
 		[] -> "";
 		Els ->
-		    OfEl = {xmlelement, "offline-messages", [], Els},
+                    OfEl = #xmlel{name = 'offline-messages',
+                                  children = Els},
+		    %OfEl = {xmlelement, "offline-messages", [], Els},
 		    exmpp_xml:document_to_list(OfEl)
 	    end;
 	{ok, mod_offline_odbc} ->
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 001e1113f..46eb9fd3b 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -634,7 +634,8 @@ process_pattern(Str, {User, Domain}, AttrValues) ->
       [{"%u", User},{"%d", Domain}] ++
       [{"%s", V, 1} || V <- AttrValues]).
 
-find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
+find_xdata_el(#xmlel{children = SubEls}) ->
+%find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
     find_xdata_el1(SubEls).
 
 find_xdata_el1([]) ->