diff --git a/rebar.config b/rebar.config
index 7af805f6e..f81e0821c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,8 +23,8 @@
         {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.19"}}},
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}},
-        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.36"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "8614cd2b9cacc1429d2b2451e15465bc4703ba11"}},
+        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "63d467e"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
 	{yconf, ".*", {git, "https://github.com/processone/yconf", "f9c235faf828f52bb01881b172646960d5a8d523"}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index 68e5119a9..2b93b4f19 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -385,7 +385,7 @@ process_user(#xmlel{name = <<"user">>, attrs = Attrs, children = Els},
     PasswordFormat = ejabberd_auth:password_format(LServer),
     Pass = case PasswordFormat of
       scram ->
-        case Password of 
+        case Password of
           <<"scram:", PassData/binary>> ->
             parse_scram_password(PassData);
           P -> P
@@ -520,7 +520,7 @@ process_private(Private, State = #state{user = U, server = S}) ->
             stop("Failed to write private: ~p", [Err])
     end.
 
--spec process_vcard(xmlel(), state()) -> {ok, state()} | {error, _}.
+-spec process_vcard(xmpp_element(), state()) -> {ok, state()} | {error, _}.
 process_vcard(El, State = #state{user = U, server = S}) ->
     JID = jid:make(U, S),
     IQ = #iq{type = set, id = p1_rand:get_string(),
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index beb164547..ef571274f 100644
--- a/src/mod_http_upload.erl
+++ b/src/mod_http_upload.erl
@@ -565,7 +565,7 @@ process_slot_request(#iq{lang = Lang, from = From} = IQ,
 
 -spec create_slot(state(), jid(), binary(), pos_integer(), binary(), binary(),
 		  binary())
-      -> {ok, slot()} | {ok, binary(), binary()} | {error, xmlel()}.
+      -> {ok, slot()} | {ok, binary(), binary()} | {error, xmpp_element()}.
 create_slot(#state{service_url = undefined, max_size = MaxSize},
 	    JID, File, Size, _ContentType, XMLNS, Lang)
   when MaxSize /= infinity,
diff --git a/src/mod_mqtt_session.erl b/src/mod_mqtt_session.erl
index f886bc3f9..d0abf85d4 100644
--- a/src/mod_mqtt_session.erl
+++ b/src/mod_mqtt_session.erl
@@ -1189,7 +1189,7 @@ authenticate(#connect{password = Pass} = Pkt, IP) ->
 %%%===================================================================
 %%% Validators
 %%%===================================================================
--spec validate_will(connect(), jid:jid()) -> ok | {error, reason_code()}.
+-spec validate_will(connect(), jid:jid()) -> ok | {error, error_reason()}.
 validate_will(#connect{will = undefined}, _) ->
     ok;
 validate_will(#connect{will = #publish{topic = Topic, payload = Payload},
diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
index b0abf1ffb..09af0c7cf 100644
--- a/src/mod_stream_mgmt.erl
+++ b/src/mod_stream_mgmt.erl
@@ -459,7 +459,7 @@ check_h_attribute(#{mgmt_stanzas_out := NumStanzasOut, jid := JID} = State, H) -
 	   [jid:encode(JID), H, NumStanzasOut]),
     mgmt_queue_drop(State, H).
 
--spec update_num_stanzas_in(state(), xmpp_element()) -> state().
+-spec update_num_stanzas_in(state(), xmpp_element() | xmlel()) -> state().
 update_num_stanzas_in(#{mgmt_state := MgmtState,
 			mgmt_stanzas_in := NumStanzasIn} = State, El)
   when MgmtState == active; MgmtState == pending ->