--- a/stream.go	Tue Mar 26 10:54:44 2013 -0600
+++ b/stream.go	Fri Aug 30 17:24:39 2013 -0600
@@ -390,7 +390,7 @@
 
 	// Now re-send the initial handshake message to start the new
 	// session.
-	hsOut := &stream{To: cl.Jid.Domain, Version: Version}
+	hsOut := &stream{To: cl.Jid.Domain, Version: XMPPVersion}
 	cl.xmlOut <- hsOut
 }
 
@@ -446,7 +446,7 @@
 	case "success":
 		Info.Log("Sasl authentication succeeded")
 		cl.Features = nil
-		ss := &stream{To: cl.Jid.Domain, Version: Version}
+		ss := &stream{To: cl.Jid.Domain, Version: XMPPVersion}
 		cl.xmlOut <- ss
 	}
 }
@@ -592,7 +592,7 @@
 	if res != "" {
 		bindReq.Resource = &res
 	}
-	msg := &Iq{Header: Header{Type: "set", Id: <-Id,
+	msg := &Iq{Header: Header{Type: "set", Id: NextId(),
 		Nested: []interface{}{bindReq}}}
 	f := func(st Stanza) bool {
 		iq, ok := st.(*Iq)