Minor updates to image field, etc