diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/crypto/EncryptedTypes.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/crypto/EncryptedTypes.java
index f3832a2..488ade2 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/crypto/EncryptedTypes.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/crypto/EncryptedTypes.java
@@ -1,6 +1,6 @@
 package org.cobbzilla.wizard.model.crypto;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.hibernate.annotations.Type;
 
 import java.lang.reflect.Field;
diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelEntity.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelEntity.java
index a053fd5..444bac6 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelEntity.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelEntity.java
@@ -1,8 +1,6 @@
 package org.cobbzilla.wizard.model.entityconfig;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.cobbzilla.wizard.model.Identifiable;
 
 public interface ModelEntity extends Identifiable {
diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
index c337339..9e4edfd 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.InvocationHandler;
 import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.daemon.AwaitResult;
 import org.cobbzilla.util.reflect.ReflectionUtil;
 import org.cobbzilla.util.string.StringUtil;
diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/StandardModelVerifyLog.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/StandardModelVerifyLog.java
index c9d96d3..7fb5703 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/StandardModelVerifyLog.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/StandardModelVerifyLog.java
@@ -5,7 +5,7 @@ import com.github.jknack.handlebars.Handlebars;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.handlebars.HandlebarsUtil;
 import org.cobbzilla.util.reflect.ReflectionUtil;
 import org.cobbzilla.util.string.StringUtil;
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
index 3356825..3129a7d 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
@@ -1,7 +1,7 @@
 package org.cobbzilla.wizardtest;
 
-import org.apache.commons.lang.math.RandomUtils;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomUtils;
 
 import java.util.List;
 
@@ -35,7 +35,7 @@ public class RandomUtil {
         return now() + (days * 1000 * 60 * 60 * 24);
     }
 
-    public static boolean randomBoolean() { return RandomUtils.nextInt(RANDOM, 2) == 0; }
+    public static boolean randomBoolean() { return (RandomUtils.nextInt(0, Integer.MAX_VALUE) % 2) == 0; }
 
     public static <T> T pickMod(T[] things, int i) {
         if (i <= 0 || i > things.length) i = things.length;
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HttpLifecycleNotifierConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HttpLifecycleNotifierConfiguration.java
index 7b1bc11..38ead0b 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HttpLifecycleNotifierConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HttpLifecycleNotifierConfiguration.java
@@ -3,7 +3,7 @@ package org.cobbzilla.wizard.server.config;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.http.HttpMethods;
 import org.cobbzilla.wizard.server.RestServerLifecycleEvent;