More fixes for profiles.