Several remaining bug fixes for collage performance.