Lazy load bugs fixed