diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index c9e10b025..b0dbe8f80 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -1027,7 +1027,7 @@ public final class EntityBeanIntercept implements Serializable {
 
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
-    } else if (oldValue != newValue) {
+    } else if (Double.compare(oldValue, newValue) != 0) {
       setChangedPropertyValue(propertyIndex, intercept, oldValue);
     } else {
       return null;
@@ -1042,7 +1042,7 @@ public final class EntityBeanIntercept implements Serializable {
 
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
-    } else if (oldValue != newValue) {
+    } else if (Float.compare(oldValue, newValue) != 0) {
       setChangedPropertyValue(propertyIndex, intercept, oldValue);
     } else {
       return null;
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index e00e00254..88d51432d 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.QueryIterator;
 import io.ebean.Version;
-import io.ebean.bean.BeanCollection;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeanservice.docstore.api.DocQueryRequest;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
index adab15058..adb74e5ce 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
@@ -60,7 +60,7 @@ public class DeployDocPropertyOptions {
   }
 
   private void setBoost(float boost) {
-    if (boost != 1) {
+    if (Float.compare(boost, 1.0F) != 0) {
       mapping.setBoost(boost);
     }
   }
diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
index d33eec7aa..e7ee70d63 100644
--- a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
+++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
@@ -229,7 +229,7 @@ public class DocPropertyOptions {
     if (docMapping.store()) {
       store = true;
     }
-    if (docMapping.boost() != 1) {
+    if (Float.compare(docMapping.boost(), 1.0F) != 0) {
       boost = docMapping.boost();
     }
     if (!"".equals(docMapping.nullValue())) {