tools: hopefully last of countryblock fixes for now.