Fixes for geo fields and image fields