More fixes to profiles.

More changes to profiles.