Image support and render fixes