Update for BuddyPress 1.7+