diff --git a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/config/RabbitMQConnectorConfig.java b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/config/RabbitMQConnectorConfig.java
index 3580318..0cde9de 100644
--- a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/config/RabbitMQConnectorConfig.java
+++ b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/config/RabbitMQConnectorConfig.java
@@ -73,7 +73,7 @@ public RabbitMQConnectorConfig(ConfigDef definition, Map<?, ?> originals) {
         this.host = this.getString(CONFIG_NAME_RABBITMQ_HOST);
         this.port = this.getInt(CONFIG_NAME_RABBITMQ_PORT);
         this.username = this.getString(CONFIG_NAME_RABBITMQ_USERNAME);
-        this.password = this.getString(CONFIG_NAME_RABBITMQ_PASSWORD);
+        this.password = this.getPassword(CONFIG_NAME_RABBITMQ_PASSWORD).value();
         this.virtualHost = this.getString(CONFIG_NAME_RABBITMQ_VIRTUAL_HOST);
         this.requestedChannelMax = this.getInt(CONFIG_NAME_RABBITMQ_REQUESTED_CHANNEL_MAX);
         this.requestedFrameMax = this.getInt(CONFIG_NAME_RABBITMQ_REQUESTED_FRAME_MAX);
@@ -94,7 +94,7 @@ public static ConfigDef config() {
         config.define(CONFIG_NAME_RABBITMQ_HOST, ConfigDef.Type.STRING, ConnectionFactory.DEFAULT_HOST, ConfigDef.Importance.HIGH, CONFIG_DOCUMENTATION_RABBITMQ_HOST);
         config.define(CONFIG_NAME_RABBITMQ_PORT, ConfigDef.Type.INT, ConnectionFactory.DEFAULT_AMQP_PORT, ConfigDef.Importance.MEDIUM, CONFIG_DOCUMENTATION_RABBITMQ_PORT);
         config.define(CONFIG_NAME_RABBITMQ_USERNAME, ConfigDef.Type.STRING, ConnectionFactory.DEFAULT_USER, ConfigDef.Importance.HIGH, CONFIG_DOCUMENTATION_RABBITMQ_USERNAME);
-        config.define(CONFIG_NAME_RABBITMQ_PASSWORD, ConfigDef.Type.STRING, ConnectionFactory.DEFAULT_PASS, ConfigDef.Importance.HIGH, CONFIG_DOCUMENTATION_RABBITMQ_PASSWORD);
+        config.define(CONFIG_NAME_RABBITMQ_PASSWORD, ConfigDef.Type.PASSWORD, ConnectionFactory.DEFAULT_PASS, ConfigDef.Importance.HIGH, CONFIG_DOCUMENTATION_RABBITMQ_PASSWORD);
         config.define(CONFIG_NAME_RABBITMQ_VIRTUAL_HOST, ConfigDef.Type.STRING, ConnectionFactory.DEFAULT_VHOST, ConfigDef.Importance.HIGH, CONFIG_DOCUMENTATION_RABBITMQ_VIRTUAL_HOST);
         config.define(CONFIG_NAME_RABBITMQ_REQUESTED_CHANNEL_MAX, ConfigDef.Type.INT, ConnectionFactory.DEFAULT_CHANNEL_MAX, ConfigDef.Importance.LOW, CONFIG_DOCUMENTATION_RABBITMQ_REQUESTED_CHANNEL_MAX);
         config.define(CONFIG_NAME_RABBITMQ_REQUESTED_FRAME_MAX, ConfigDef.Type.INT, ConnectionFactory.DEFAULT_FRAME_MAX, ConfigDef.Importance.LOW, CONFIG_DOCUMENTATION_RABBITMQ_REQUESTED_FRAME_MAX);
diff --git a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/schema/HeaderSchema.java b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/schema/HeaderSchema.java
index ee5d8ac..54edf4d 100644
--- a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/schema/HeaderSchema.java
+++ b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/schema/HeaderSchema.java
@@ -72,10 +72,10 @@ static Map<String, Struct> toStructMap(BasicProperties basicProperties) {
                 if (kvp.getValue() instanceof LongString) {
                     headerValue = kvp.getValue().toString();
                 } else if (kvp.getValue() instanceof List) {
-                    final List<LongString> list = (List<LongString>) kvp.getValue();
+                    final List<Object> list = (List<Object>) kvp.getValue();
                     final List<String> values = new ArrayList<>(list.size());
-                    for (LongString l : list) {
-                        values.add(l.toString());
+                    for (Object obj : list) {
+                        values.add(obj.toString());
                     }
                     headerValue = values;
                 } else {
diff --git a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/sourcerecord/RabbitMQSourceRecordFactory.java b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/sourcerecord/RabbitMQSourceRecordFactory.java
index b6dadfd..a2261d0 100644
--- a/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/sourcerecord/RabbitMQSourceRecordFactory.java
+++ b/src/main/java/com/ibm/eventstreams/connect/rabbitmqsource/sourcerecord/RabbitMQSourceRecordFactory.java
@@ -70,10 +70,10 @@ private List<Header> toConnectHeaders(Map<String, Object> ampqHeaders) {
             if (headerValue instanceof LongString) {
                 headerValue = kvp.getValue().toString();
             } else if (kvp.getValue() instanceof List) {
-                final List<LongString> list = (List<LongString>) headerValue;
+                final List<Object> list = (List<Object>) kvp.getValue();
                 final List<String> values = new ArrayList<>(list.size());
-                for (LongString l : list) {
-                    values.add(l.toString());
+                for (Object obj : list) {
+                    values.add(obj.toString());
                 }
                 headerValue = values;
             }