Mostly fix side paddle collisions