LazyCollection fixes