diff --git a/core/src/main/java/info/openrocket/core/logging/Warning.java b/core/src/main/java/info/openrocket/core/logging/Warning.java
index 572d7fd94..30bd9364b 100644
--- a/core/src/main/java/info/openrocket/core/logging/Warning.java
+++ b/core/src/main/java/info/openrocket/core/logging/Warning.java
@@ -276,17 +276,13 @@ public abstract class Warning extends Message {
 		public int hashCode() {
 			final int prime = 31;
 			int result = super.hashCode();
-			long temp;
-			temp = Double.doubleToLongBits(delay);
-			result = prime * result + (int) (temp ^ (temp >>> 32));
+			result = prime * result + Double.hashCode(delay);
 			result = prime * result
 					+ ((designation == null) ? 0 : designation.hashCode());
-			temp = Double.doubleToLongBits(diameter);
-			result = prime * result + (int) (temp ^ (temp >>> 32));
+			result = prime * result + Double.hashCode(diameter);
 			result = prime * result
 					+ ((digest == null) ? 0 : digest.hashCode());
-			temp = Double.doubleToLongBits(length);
-			result = prime * result + (int) (temp ^ (temp >>> 32));
+			result = prime * result + Double.hashCode(length);
 			result = prime * result
 					+ ((manufacturer == null) ? 0 : manufacturer.hashCode());
 			result = prime * result + ((type == null) ? 0 : type.hashCode());
diff --git a/core/src/main/java/info/openrocket/core/unit/Value.java b/core/src/main/java/info/openrocket/core/unit/Value.java
index 2da905c2b..c38f16b77 100644
--- a/core/src/main/java/info/openrocket/core/unit/Value.java
+++ b/core/src/main/java/info/openrocket/core/unit/Value.java
@@ -105,9 +105,7 @@ public class Value implements Comparable<Value> {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((unit == null) ? 0 : unit.hashCode());
-		long temp;
-		temp = Double.doubleToLongBits(value);
-		result = prime * result + (int) (temp ^ (temp >>> 32));
+		result = prime * result + Double.hashCode(value);
 		return result;
 	}
 
diff --git a/core/src/main/java/info/openrocket/core/util/Transformation.java b/core/src/main/java/info/openrocket/core/util/Transformation.java
index acf7bce87..17250a27d 100644
--- a/core/src/main/java/info/openrocket/core/util/Transformation.java
+++ b/core/src/main/java/info/openrocket/core/util/Transformation.java
@@ -340,7 +340,7 @@ public class Transformation implements java.io.Serializable {
 			}
 		}
 		bits ^= translate.hashCode();
-		return (int) (bits ^ (bits >>> 32));
+		return Long.hashCode(bits);
 	}
 
 	/**