Import from PhoneProfiles; fixes