fix handoff race and timing out control reqs