Performance/collision tweaks