Some improvements with robustness while loading.