Fixing issues detected on new images manager