diff --git a/pom.xml b/pom.xml
index 20f0979..651cf16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-(c) Copyright 2013-2014 Jonathan Cobb
+(c) Copyright 2013-2020 Jonathan Cobb
 cobbzilla-wizard is available under the Apache License, version 2: http://www.apache.org/licenses/LICENSE-2.0.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java b/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java
index 673d71f..6d4e852 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.map.SingletonMap;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.http.Header;
@@ -19,6 +18,7 @@ import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HttpContext;
+import org.cobbzilla.util.collection.MapBuilder;
 import org.cobbzilla.util.collection.NameAndValue;
 import org.cobbzilla.util.http.ApiConnectionInfo;
 import org.cobbzilla.util.http.HttpRequestBean;
@@ -519,11 +519,11 @@ public class ApiClientBase implements Cloneable, Closeable {
 
     public InputStream getStream(HttpRequestBean request) throws IOException {
         if (request.getMethod().equals(GET)) {
-            return HttpUtil.get(getBaseUri() + request.getUri(), new SingletonMap<>(getTokenHeader(), getToken()), headers);
+            return HttpUtil.get(getBaseUri() + request.getUri(), MapBuilder.build(getTokenHeader(), getToken()), headers);
         } else if (request.getMethod().equals(POST)) {
-            return HttpUtil.post(getBaseUri() + request.getUri(), request.getEntityInputStream(), null, new SingletonMap<>(getTokenHeader(), getToken()), headers);
+            return HttpUtil.post(getBaseUri() + request.getUri(), request.getEntityInputStream(), null, MapBuilder.build(getTokenHeader(), getToken()), headers);
         } else if (request.getMethod().equals(PUT)) {
-            return HttpUtil.put(getBaseUri() + request.getUri(), request.getEntityInputStream(), null, new SingletonMap<>(getTokenHeader(), getToken()), headers);
+            return HttpUtil.put(getBaseUri() + request.getUri(), request.getEntityInputStream(), null, MapBuilder.build(getTokenHeader(), getToken()), headers);
         } else {
             throw new IOException("getStream: unsupported HTTP request method: "+request.getMethod());
         }
@@ -531,9 +531,9 @@ public class ApiClientBase implements Cloneable, Closeable {
 
     public InputStream uploadMultipartStream(HttpRequestBean request, String name) throws IOException {
         if (request.getMethod().equals(POST)) {
-            return HttpUtil.post(getBaseUri() + request.getUri(), request.getEntityInputStream(), name, new SingletonMap<>(getTokenHeader(), getToken()), headers);
+            return HttpUtil.post(getBaseUri() + request.getUri(), request.getEntityInputStream(), name, MapBuilder.build(getTokenHeader(), getToken()), headers);
         } else if (request.getMethod().equals(PUT)) {
-            return HttpUtil.put(getBaseUri() + request.getUri(), request.getEntityInputStream(), name, new SingletonMap<>(getTokenHeader(), getToken()), headers);
+            return HttpUtil.put(getBaseUri() + request.getUri(), request.getEntityInputStream(), name, MapBuilder.build(getTokenHeader(), getToken()), headers);
         } else {
             throw new IOException("uploadMultipartStream: unsupported HTTP request method: "+request.getMethod());
         }
diff --git a/wizard-server/pom.xml b/wizard-server/pom.xml
index 7c70847..1a4be2d 100644
--- a/wizard-server/pom.xml
+++ b/wizard-server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-(c) Copyright 2013-2016 Jonathan Cobb
+(c) Copyright 2013-2020 Jonathan Cobb
 This code is available under the Apache License, version 2: http://www.apache.org/licenses/LICENSE-2.0.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -185,7 +185,7 @@ This code is available under the Apache License, version 2: http://www.apache.or
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>0.9.5.4</version>
+            <version>0.9.5.5</version>
         </dependency>
 
         <!-- servlets and webapps -->
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java
index 1a5342f..b327060 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java
@@ -14,7 +14,7 @@ import io.swagger.v3.oas.models.servers.Server;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.map.SingletonMap;
+import org.cobbzilla.util.collection.MapBuilder;
 import org.cobbzilla.util.handlebars.HandlebarsUtil;
 import org.cobbzilla.util.handlebars.HasHandlebars;
 import org.cobbzilla.wizard.filters.auth.AuthFilter;
@@ -91,7 +91,7 @@ public class OpenApiConfiguration {
                 .in(SecurityScheme.In.HEADER);
 
         final OpenAPI oas = new OpenAPI()
-                .components(new Components().securitySchemes(new SingletonMap<>(SEC_API_KEY, securityScheme)))
+                .components(new Components().securitySchemes(MapBuilder.build(SEC_API_KEY, securityScheme)))
                 .info(info)
                 .servers(servers);