Please Review: Fixes some country ids