diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py
index 8f7cfeaf..4d17d725 100644
--- a/sleekxmpp/componentxmpp.py
+++ b/sleekxmpp/componentxmpp.py
@@ -131,7 +131,7 @@ class ComponentXMPP(BaseXMPP):
 
         handshake = ET.Element('{jabber:component:accept}handshake')
         handshake.text = hashlib.sha1(pre_hash).hexdigest().lower()
-        self.send_xml(handshake)
+        self.send_xml(handshake, now=True)
 
     def _handle_handshake(self, xml):
         """
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index fe964e96..72c6c513 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -171,7 +171,7 @@ class xep_0050(base_plugin):
         """
         if jid is None:
             jid = self.xmpp.boundjid
-        elif isinstance(jid, str):
+        elif not isinstance(jid, JID):
             jid = JID(jid)
         item_jid = jid.full