Minor changes to adapt to new images manager