Better crosshair handling