Changes to work on fixing problems with loading some images