Fix for aws image lookups