more rendezvous fixes