Fix BSC handshake problems