diff --git a/cmd/fission-bundle/main.go b/cmd/fission-bundle/main.go
index 35d18b50..69af08d0 100644
--- a/cmd/fission-bundle/main.go
+++ b/cmd/fission-bundle/main.go
@@ -256,7 +256,7 @@ Options:
 	defer logger.Sync()
 
 	version := fmt.Sprintf("Fission Bundle Version: %v", info.BuildInfo().String())
-	arguments, err := docopt.Parse(usage, nil, true, version, false)
+	arguments, err := docopt.ParseArgs(usage, nil, version)
 	if err != nil {
 		logger.Fatal("Could not parse command line arguments", zap.Error(err))
 	}
diff --git a/cmd/preupgradechecks/main.go b/cmd/preupgradechecks/main.go
index 0c7fa7e3..4471fd3e 100644
--- a/cmd/preupgradechecks/main.go
+++ b/cmd/preupgradechecks/main.go
@@ -51,7 +51,7 @@ Options:
   --fn-pod-namespace=<podNamespace>                        Namespace where function pods get deployed.
   --envbuilder-namespace=<envBuilderNamespace>             Namespace where builder env pods are deployed.`
 
-	arguments, err := docopt.Parse(usage, nil, true, info.BuildInfo().String(), false)
+	arguments, err := docopt.ParseArgs(usage, nil, info.BuildInfo().String())
 	if err != nil {
 		logger.Fatal("Could not parse command line arguments", zap.Error(err))
 	}
diff --git a/pkg/mqtrigger/messageQueue/kafka/kafka.go b/pkg/mqtrigger/messageQueue/kafka/kafka.go
index 078e7756..e409acd9 100644
--- a/pkg/mqtrigger/messageQueue/kafka/kafka.go
+++ b/pkg/mqtrigger/messageQueue/kafka/kafka.go
@@ -212,7 +212,6 @@ func (kafka Kafka) getTLSConfig() (*tls.Config, error) {
 	caCertPool := x509.NewCertPool()
 	caCertPool.AppendCertsFromPEM(kafka.authKeys["caCert"])
 	tlsConfig.RootCAs = caCertPool
-	tlsConfig.BuildNameToCertificate()
 
 	return &tlsConfig, nil
 }
@@ -323,7 +322,7 @@ func kafkaMsgHandler(kafka *Kafka, producer sarama.SyncProducer, trigger *fv1.Me
 		return
 	}
 	if resp.StatusCode != 200 {
-		errorString := string("request returned failure: " + string(resp.StatusCode))
+		errorString := string("request returned failure: " + strconv.Itoa(resp.StatusCode))
 		errorHeaders := generateErrorHeaders(errorString)
 		errorHandler(kafka.logger, trigger, producer, url,
 			fmt.Errorf("request returned failure: %v", resp.StatusCode), errorHeaders)