geo-rep fixes from Nathan R. Hruby