Fix a couple bugs with multiple calls associated with early start