diff --git a/pkg/issuer/selfsigned/selfsigned.go b/pkg/issuer/selfsigned/selfsigned.go
index 2cfb25c33..1e11fca92 100644
--- a/pkg/issuer/selfsigned/selfsigned.go
+++ b/pkg/issuer/selfsigned/selfsigned.go
@@ -25,6 +25,7 @@ import (
 )
 
 // SelfSigned is an Issuer implementation the simply self-signs Certificates.
+// For more info see: https://cert-manager.io/docs/configuration/selfsigned/
 type SelfSigned struct {
 	*controller.Context
 	issuer v1.GenericIssuer
diff --git a/pkg/issuer/vault/setup.go b/pkg/issuer/vault/setup.go
index 2555193c6..9a3c450a4 100644
--- a/pkg/issuer/vault/setup.go
+++ b/pkg/issuer/vault/setup.go
@@ -98,7 +98,7 @@ func (v *Vault) Setup(ctx context.Context) error {
 		return nil
 	}
 	if appRoleAuth != nil && len(appRoleAuth.SecretRef.Key) == 0 {
-		logf.V(logf.WarnLevel).Infof("%s: %s", v.issuer.GetObjectMeta().Name, messageTokenAuthNameRequired)
+		logf.V(logf.WarnLevel).Infof("%s: %s", v.issuer.GetObjectMeta().Name, messageAppRoleAuthKeyRequired)
 		apiutil.SetIssuerCondition(v.issuer, v.issuer.GetGeneration(), v1.IssuerConditionReady, cmmeta.ConditionFalse, errorVault, messageAppRoleAuthKeyRequired)
 		return nil
 	}
diff --git a/pkg/issuer/venafi/client/instrumentedvenaficlient.go b/pkg/issuer/venafi/client/instrumentedvenaficlient.go
index 70ce2b2c9..b4c47262a 100644
--- a/pkg/issuer/venafi/client/instrumentedvenaficlient.go
+++ b/pkg/issuer/venafi/client/instrumentedvenaficlient.go
@@ -35,6 +35,10 @@ type instrumentedConnector struct {
 
 var _ connector = instrumentedConnector{}
 
+var (
+	now = time.Now()
+)
+
 func newInstumentedConnector(conn connector, metrics *metrics.Metrics, log logr.Logger) connector {
 	return instrumentedConnector{
 		conn:    conn,
@@ -44,46 +48,41 @@ func newInstumentedConnector(conn connector, metrics *metrics.Metrics, log logr.
 }
 
 func (ic instrumentedConnector) ReadZoneConfiguration() (*endpoint.ZoneConfiguration, error) {
-	start := time.Now()
 	ic.logger.V(logf.TraceLevel).Info("calling ReadZoneConfiguration")
 	config, err := ic.conn.ReadZoneConfiguration()
 	labels := []string{"read_zone_configuration"}
-	ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
+	ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
 	return config, err
 }
 
 func (ic instrumentedConnector) RequestCertificate(req *certificate.Request) (string, error) {
-	start := time.Now()
 	ic.logger.V(logf.TraceLevel).Info("calling RequestCertificate")
 	reqID, err := ic.conn.RequestCertificate(req)
 	labels := []string{"request_certificate"}
-	ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
+	ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
 	return reqID, err
 }
 
 func (ic instrumentedConnector) RetrieveCertificate(req *certificate.Request) (*certificate.PEMCollection, error) {
-	start := time.Now()
 	ic.logger.V(logf.TraceLevel).Info("calling RetrieveCertificate")
 	pemCollection, err := ic.conn.RetrieveCertificate(req)
 	labels := []string{"retrieve_certificate"}
-	ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
+	ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
 	return pemCollection, err
 }
 
 func (ic instrumentedConnector) Ping() error {
-	start := time.Now()
 	ic.logger.V(logf.TraceLevel).Info("calling Ping")
 	err := ic.conn.Ping()
 	labels := []string{"ping"}
-	ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
+	ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
 	return err
 }
 
 func (ic instrumentedConnector) RenewCertificate(req *certificate.RenewalRequest) (string, error) {
-	start := time.Now()
 	ic.logger.V(logf.TraceLevel).Info("calling RenewCertificate")
 	reqID, err := ic.conn.RenewCertificate(req)
 	labels := []string{"renew_certificate"}
-	ic.metrics.ObserveVenafiRequestDuration(time.Since(start), labels...)
+	ic.metrics.ObserveVenafiRequestDuration(time.Since(now), labels...)
 	return reqID, err
 }