Improved handling of remote profiles.