Fix subkey connections.