fix: more image support hardening