Fix update countries and messages