Added some bootstrapping waits.