Fix more cert validation issues.