some fixes on Country model