* (bug 1850) Additional fixes so existing local and remote images