Fixes for Image fields