Attempted more physx fixes
Merge issues resolved