minor tweaks for lazy loading