fixes for BuddyPress issue #4