Synchronize on handshake, add logging