Little collision enhancements!