Loading race condition fixes.