Fixing timeout bugs in leader interface.