Direct encoder; fixes for image fields.