More fixes on the geo suboptions