Changes to work on fixing problems with a few images