first draft of BuddyPress 1.6 compatibility