Improvements to handle image files with metadata from more cameras.