diff --git a/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs
index f2f9a59..7609c5e 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs
@@ -1015,6 +1015,7 @@ namespace UnrealBuildTool
 					}
 				}
 			}
+			LinkAction.CommandArguments += " -lcuda -lcudart -lflexRelease_x64 -lflexReleaseExt_x64";
 			LinkAction.CommandArguments += " -lrt"; // needed for clock_gettime()
 			LinkAction.CommandArguments += " -lm"; // math
 			LinkAction.CommandArguments += string.Format(" -Wl,--end-group");
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/FlexContainerInstance.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/FlexContainerInstance.cpp
index 5a880d9..3315a5c 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/FlexContainerInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/FlexContainerInstance.cpp
@@ -360,12 +360,12 @@ void FFlexContainerInstance::UpdateCollisionData()

 							FlexCollisionPlane planes[6] =
 							{
-								{ 1.0f, 0.0f, 0.0f, -BoxGeometry.halfExtents.x },
-								{ 0.0f, 1.0f, 0.0f, -BoxGeometry.halfExtents.y },
-								{ 0.0f, 0.0f, 1.0f, -BoxGeometry.halfExtents.z },
-								{-1.0f, 0.0f, 0.0f, -BoxGeometry.halfExtents.x },
-								{ 0.0f, -1.0f, 0.0f, -BoxGeometry.halfExtents.y },
-								{ 0.0f, 0.0f, -1.0f, -BoxGeometry.halfExtents.z }
+								{{ 1.0f, 0.0f, 0.0f, -BoxGeometry.halfExtents.x }},
+								{{ 0.0f, 1.0f, 0.0f, -BoxGeometry.halfExtents.y }},
+								{{ 0.0f, 0.0f, 1.0f, -BoxGeometry.halfExtents.z }},
+								{{-1.0f, 0.0f, 0.0f, -BoxGeometry.halfExtents.x }},
+								{{ 0.0f, -1.0f, 0.0f, -BoxGeometry.halfExtents.y }},
+								{{ 0.0f, 0.0f, -1.0f, -BoxGeometry.halfExtents.z }}
 							};

 							for (int i=0; i < 6; ++i)

diff --git a/Engine/Source/ThirdParty/PhysX/PhysX-3.3/include/PxQueryReport.h b/Engine/Source/ThirdParty/PhysX/PhysX-3.3/include/PxQueryReport.h
index 53f5d16..bc3d86a 100644
--- a/Engine/Source/ThirdParty/PhysX/PhysX-3.3/include/PxQueryReport.h
+++ b/Engine/Source/ThirdParty/PhysX/PhysX-3.3/include/PxQueryReport.h
@@ -98,6 +98,9 @@ struct PxActorShape

 	PxRigidActor*	actor;
 	PxShape*		shape;
+	friend bool operator == (const PxActorShape& lhs, const PxActorShape& rhs) { return lhs.actor == rhs.actor && lhs.shape == rhs.shape; }
+	friend uint32 GetTypeHash(const PxActorShape& h) { return ::GetTypeHash((void*)(h.actor)) ^ ::GetTypeHash((void*)(h.shape)); }
+
 };