Fix some partial matches due to tls 1.2 upgrade