Merge of #2380 missed a couple of cases, and added a few more sleeps to help with background loading checks.