diff --git a/src/main/java/com/ibm/watson/modelmesh/ModelMesh.java b/src/main/java/com/ibm/watson/modelmesh/ModelMesh.java
index 78c776b4..fefa4a5e 100644
--- a/src/main/java/com/ibm/watson/modelmesh/ModelMesh.java
+++ b/src/main/java/com/ibm/watson/modelmesh/ModelMesh.java
@@ -927,7 +927,7 @@ protected final TProcessor initialize() throws Exception {
     // "type" or "type:p1=v1;p2=v2;...;pn=vn"
     private static final Pattern METRICS_CONFIG_PATT = Pattern.compile("([a-z;]+)(:\\w+=[^;]+(?:;\\w+=[^;]+)*)?");
     // "metric_name" or "metric:name;l1=v1,l2=v2,...,ln=vn,"
-    private static final Pattern CUSTOM_METRIC_CONFIG_PATT = Pattern.compile("([a-z_:]+);(\\w+=[^;]+(?:;\\w+=[^,]+)*)?");
+    private static final Pattern CUSTOM_METRIC_CONFIG_PATT = Pattern.compile("([a-z_:]+);(\\w+=[^;]+(?:;\\w+=[^,]++)*)?");
 
     private static Metrics setUpMetrics() throws Exception {
         if (System.getenv("MM_METRICS_STATSD_PORT") != null || System.getenv("MM_METRICS_PROMETHEUS_PORT") != null) {
diff --git a/src/test/java/com/ibm/watson/modelmesh/ModelMeshTearDownTest.java b/src/test/java/com/ibm/watson/modelmesh/ModelMeshTearDownTest.java
index ef802161..d50aa72c 100644
--- a/src/test/java/com/ibm/watson/modelmesh/ModelMeshTearDownTest.java
+++ b/src/test/java/com/ibm/watson/modelmesh/ModelMeshTearDownTest.java
@@ -315,7 +315,7 @@ public static int getPID(Process process) throws Exception {
     }
 
     public static int killProcess(Process process) throws Exception {
-        int pid = getPID(process);
-        return Runtime.getRuntime().exec("kill -9 " + pid).waitFor();
+        String pid = Integer.toString(getPID(process));
+        return Runtime.getRuntime().exec(new String[] {"kill", "-9", pid}).waitFor();
     }
 }