Fixes to country info and module def