Geocod patches

these were changes introduced in the geocod PR.

cc @jwolski