Lazy loader fixes