Fixes for image indexing.