Some lazyload changes.