diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index dd21eaa7d..0835881a5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -84,9 +84,4 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
     return beanDbMap.getDbValue(beanValue);
   }
 
-  @Override
-  public DocPropertyType getDocType() {
-    return DocPropertyType.STRING;
-  }
-
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index 0ca7efac3..10b0a199b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -1,5 +1,6 @@
 package com.avaje.ebeaninternal.server.type;
 
+import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
 import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -48,6 +49,16 @@ public abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> {
     return false;
   }
 
+  @Override
+  public UUID toBeanType(Object value) {
+    return BasicTypeConverter.toUUID(value);
+  }
+
+  @Override
+  public Object toJdbcType(Object value) {
+    return BasicTypeConverter.convert(value, jdbcType);
+  }
+
   @Override
   public UUID readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index 6f01a79a6..34fad2b61 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -1,5 +1,7 @@
 package com.avaje.ebeaninternal.server.type;
 
+import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -27,7 +29,11 @@ public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
   @Override
   public UUID toBeanType(Object value) {
-    return convertFromBytes((byte[]) value);
+    if (value instanceof byte[]) {
+      return convertFromBytes((byte[]) value);
+    } else {
+      return BasicTypeConverter.toUUID(value);
+    }
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java
index f90776bc0..c69ae0fa8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java
@@ -33,9 +33,4 @@ public class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
     return value;
   }
 
-  @Override
-  public UUID toBeanType(Object value) {
-    return (UUID) value;
-  }
-
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
index a249577da..bc112d271 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
@@ -4,8 +4,6 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.UUID;
 
-import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
-
 /**
  * ScalarType for java.util.UUID which converts to and from a VARCHAR database column.
  */
@@ -20,16 +18,6 @@ public class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
     return 40;
   }
 
-  @Override
-  public UUID toBeanType(Object value) {
-    return BasicTypeConverter.toUUID(value);
-  }
-
-  @Override
-  public Object toJdbcType(Object value) {
-    return BasicTypeConverter.convert(value, jdbcType);
-  }
-
   @Override
   public void bind(DataBind b, UUID value) throws SQLException {
     if (value == null) {