Changes to play nice with oakwood-widget-image-field widget