Fix geo issues