diff --git a/code/IFCCurve.cpp b/code/IFCCurve.cpp
index 74927b29d..d5e379d43 100644
--- a/code/IFCCurve.cpp
+++ b/code/IFCCurve.cpp
@@ -120,7 +120,8 @@ public:
 	// --------------------------------------------------
 	IfcVector3 Eval(IfcFloat u) const {
 		u = -conv.angle_scale * u;
-		return location + entity.Radius*(static_cast<IfcFloat>(::cos(u))*p[0] + static_cast<IfcFloat>(::sin(u))*p[1]);
+		return location + static_cast<IfcFloat>(entity.Radius)*(static_cast<IfcFloat>(::cos(u))*p[0] + 
+			static_cast<IfcFloat>(::sin(u))*p[1]);
 	}
 
 private:
@@ -148,7 +149,8 @@ public:
 	// --------------------------------------------------
 	IfcVector3 Eval(IfcFloat u) const {
 		u = -conv.angle_scale * u;
-		return location + entity.SemiAxis1*static_cast<IfcFloat>(::cos(u))*p[0] + entity.SemiAxis2*static_cast<IfcFloat>(::sin(u))*p[1];
+		return location + static_cast<IfcFloat>(entity.SemiAxis1)*static_cast<IfcFloat>(::cos(u))*p[0] +
+			static_cast<IfcFloat>(entity.SemiAxis2)*static_cast<IfcFloat>(::sin(u))*p[1];
 	}
 
 private:
diff --git a/code/IFCGeometry.cpp b/code/IFCGeometry.cpp
index 3c0910ab9..994c9cc58 100644
--- a/code/IFCGeometry.cpp
+++ b/code/IFCGeometry.cpp
@@ -1457,7 +1457,7 @@ void ProcessSweptAreaSolid(const IfcSweptAreaSolid& swept, TempMesh& meshout, Co
 
 			IfcVector3 dir;
 			ConvertDirection(dir,solid->ExtrudedDirection);
-			conv.collect_openings->push_back(TempOpening(solid, IfcMatrix3(m) * (dir*solid->Depth),meshtmp));
+			conv.collect_openings->push_back(TempOpening(solid, IfcMatrix3(m) * (dir*static_cast<IfcFloat>(solid->Depth)),meshtmp));
 			return;
 		}
 
diff --git a/code/STEPFile.h b/code/STEPFile.h
index be77a2ec2..cc038faca 100644
--- a/code/STEPFile.h
+++ b/code/STEPFile.h
@@ -281,8 +281,8 @@ namespace STEP {
 		};
 
 		typedef PrimitiveDataType<int64_t>			INTEGER; 
-		typedef PrimitiveDataType<float>			REAL; 
-		typedef PrimitiveDataType<float>			NUMBER; 
+		typedef PrimitiveDataType<double>			REAL; 
+		typedef PrimitiveDataType<double>			NUMBER; 
 		typedef PrimitiveDataType<std::string>		STRING;