More bug fixes for profiles.