diff --git a/Code/Base/Powertrain/Transmission.cs b/Code/Base/Powertrain/Transmission.cs
index 53b25c6..6b1da8d 100644
--- a/Code/Base/Powertrain/Transmission.cs
+++ b/Code/Base/Powertrain/Transmission.cs
@@ -246,7 +246,6 @@ public class Transmission : PowertrainComponent
 	[Property] public bool AllowDownshiftGearSkipping { get; set; } = true;
 
 	private bool _repeatInputFlag;
-	private float _smoothedThrottleInput;
 
 	/// <summary>
 	///     Timer needed to prevent manual transmission from slipping out of gear too soon when hold in gear is enabled,
diff --git a/Code/Base/Wheel/VeloXWheel.cs b/Code/Base/Wheel/VeloXWheel.cs
index caac34b..e4f7a2f 100644
--- a/Code/Base/Wheel/VeloXWheel.cs
+++ b/Code/Base/Wheel/VeloXWheel.cs
@@ -14,7 +14,6 @@ public partial class VeloXWheel : Component
 	[Property, Group( "Suspension" )] public float SpringStiffness { get; set; } = 20000.0f;
 	[Property, Group( "Suspension" )] float ReboundStiffness { get; set; } = 2200;
 	[Property, Group( "Suspension" )] float CompressionStiffness { get; set; } = 2400;
-	[Property, Group( "Suspension" )] float BumpStopStiffness { get; set; } = 5000;
 
 	[Property, Group( "Traction" )] public TirePreset Tire { get; set; } = ResourceLibrary.Get<TirePreset>( "frictions/default.tire" );
 	[Property, Group( "Traction" )] public float SurfaceGrip { get; set; } = 1f;
@@ -128,7 +127,6 @@ public partial class VeloXWheel : Component
 
 	}
 
-	const string playerTag = "player";
 
 	private bool TraceWheel( VeloXBase vehicle, ref WheelTraceData wheelTraceData, Vector3 start, Vector3 end, float width, in float dt )
 	{
@@ -139,7 +137,7 @@ public partial class VeloXWheel : Component
 						.Rotated( vehicle.WorldRotation * CylinderOffset )
 						.UseHitPosition( false )
 						.IgnoreGameObjectHierarchy( Vehicle.GameObject )
-						.WithoutTags( playerTag )
+						.WithCollisionRules( Vehicle.GameObject.Tags )
 						.Run();
 
 		//DebugOverlay.Trace( trace, overlay: true );
@@ -160,10 +158,6 @@ public partial class VeloXWheel : Component
 
 			float FzPoint = springForce + damperForce;
 
-			// Bump stop
-			float minCompression = -0.05f;
-			if ( compression <= minCompression ) FzPoint += (minCompression - compression) * BumpStopStiffness;
-
 			wheelTraceData.ContactNormal += contactNormal;
 			wheelTraceData.ContactPosition += contactPos;
 			wheelTraceData.Compression += compression;
diff --git a/UnitTests/UnitTest.cs b/UnitTests/UnitTest.cs
index 1ae9250..7d5ebbe 100644
--- a/UnitTests/UnitTest.cs
+++ b/UnitTests/UnitTest.cs
@@ -6,6 +6,6 @@ public class TestInit
 	[AssemblyInitialize]
 	public static void ClassInitialize( TestContext context )
 	{
-		Sandbox.Application.InitUnitTest();
+		Sandbox.Application.InitUnitTest<TestInit>( false, false );
 	}
 }