fixes for pool handshakes