MAESTRO-3162 + MAESTRO-3160 Additional images, plus a couple of fixes