Fix some Country logic