Crosshair fixes