Pitch fix and dragging fix