Fixed some issues around lazy load.