diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl
index d178902c0..e80ac9993 100644
--- a/src/ejd2odbc.erl
+++ b/src/ejd2odbc.erl
@@ -175,8 +175,8 @@ import(LServer, SelectQuery, IO, ConvertFun, Opts) ->
             false ->
                 fun() ->
                         ejabberd_odbc:sql_query_t(
-                          iolist_to_binary(
-                            [<<"declare c cursor for ">>, SelectQuery])),
+                          [iolist_to_binary(
+                             [<<"declare c cursor for ">>, SelectQuery])]),
                         fetch(IO, ConvertFun, undefined)
                 end
         end,
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 10ee7b409..59e93d084 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -916,9 +916,9 @@ import(LServer) ->
       fun([LUser, XML]) ->
               El = #xmlel{} = xml_stream:parse_element(XML),
               From = #jid{} = jlib:string_to_jid(
-                                xml:get_attr_s(<<"from">>, El)),
+                                xml:get_attr_s(<<"from">>, El#xmlel.attrs)),
               To = #jid{} = jlib:string_to_jid(
-                              xml:get_attr_s(<<"to">>, El)),
+                              xml:get_attr_s(<<"to">>, El#xmlel.attrs)),
               Stamp = xml:get_path_s(El, [{elem, <<"delay">>},
                                           {elem, <<"stamp">>},
                                           cdata]),