Update and fix GeoIP support