Some cleanups and sanity for protocol; Bind message