More tweaks, fixes for GeoIP lookup