x509 format - fixes