Added waits to prevent errors from slow connections