Fix pull issues