speed fixes in library collection