Mostly fix player vs static prop/brush collisions