Small updates to loading.