diff --git a/vphysics_jolt/vjolt_controller_fluid.cpp b/vphysics_jolt/vjolt_controller_fluid.cpp
index 446c0db..c788e92 100644
--- a/vphysics_jolt/vjolt_controller_fluid.cpp
+++ b/vphysics_jolt/vjolt_controller_fluid.cpp
@@ -107,8 +107,10 @@ void JoltPhysicsFluidController::OnJoltPhysicsObjectDestroyed( JoltPhysicsObject
 	std::erase_if( m_ObjectsInShape, [pObject]( JoltPhysicsObject *pCachedObject ) { return pObject == pCachedObject; } );
 #else
 	for ( auto it( m_ObjectsInShape.begin() ); it != m_ObjectsInShape.end(); ++it ) {
-		if ( *it == pObject )
-			it = m_ObjectsInShape.erase(it);
+		if ( *it == pObject ) {
+			m_ObjectsInShape.erase(it);
+			break;
+		}
 	}
 #endif
 }
diff --git a/vphysics_jolt/vjolt_listener_contact.h b/vphysics_jolt/vjolt_listener_contact.h
index 8dd77e9..fe77c6a 100644
--- a/vphysics_jolt/vjolt_listener_contact.h
+++ b/vphysics_jolt/vjolt_listener_contact.h
@@ -5,12 +5,10 @@
 
 struct JoltPhysicsContactPair
 {
-#if __cplusplus < 202002L
 	JoltPhysicsContactPair( JoltPhysicsObject *object1, JoltPhysicsObject *object2 )
 		: pObject1(object1), pObject2(object2)
 	{
 	}
-#endif
 
 	JoltPhysicsObject *pObject1 = nullptr;
 	JoltPhysicsObject *pObject2 = nullptr;
diff --git a/vphysics_jolt/vjolt_objectpairhash.cpp b/vphysics_jolt/vjolt_objectpairhash.cpp
index 2a9d66d..80650b4 100644
--- a/vphysics_jolt/vjolt_objectpairhash.cpp
+++ b/vphysics_jolt/vjolt_objectpairhash.cpp
@@ -58,7 +58,7 @@ bool JoltPhysicsObjectPairHash::IsObjectPairInHash( void *pObject0, void *pObjec
 #if __cplusplus >= 202002L
     return pairHashes.contains( pair );
 #else
-	return pairHashes.find( pair ) != pairHashes.cend();
+    return pairHashes.find( pair ) != pairHashes.end();
 #endif
 }
 
@@ -79,7 +79,7 @@ bool JoltPhysicsObjectPairHash::IsObjectInHash( void *pObject0 )
 #if __cplusplus >= 202002L
     return m_Objects.contains( pObject0 );
 #else
-	return m_Objects.find( pObject0 ) != m_Objects.cend();
+    return m_Objects.find( pObject0 ) != m_Objects.end();
 #endif
 }