Squamp Collider fixes