diff --git src/bp-core/bp-core-classes.php src/bp-core/bp-core-classes.php
index 6e48852..a232360 100644
--- src/bp-core/bp-core-classes.php
+++ src/bp-core/bp-core-classes.php
@@ -1547,7 +1547,7 @@ class BP_Date_Query extends WP_Date_Query {
 	 * Destructor.
 	 */
 	public function __destruct() {
-		remove_filter( 'date_query_valid_columns', array( $this, 'register_date_column' ) );	
+		remove_filter( 'date_query_valid_columns', array( $this, 'register_date_column' ) );
 	}
 
 	/**
diff --git src/bp-xprofile/bp-xprofile-classes.php src/bp-xprofile/bp-xprofile-classes.php
index d18a041..de81384 100644
--- src/bp-xprofile/bp-xprofile-classes.php
+++ src/bp-xprofile/bp-xprofile-classes.php
@@ -3661,6 +3661,6 @@ class BP_XProfile_Query {
 		}
 
 		// Don't recurse
-		remove_action( 'bp_user_query_populate_extras', array( $xprofile_query, 'populate_extras' ), 10, 2 );
+		remove_action( 'bp_user_query_populate_extras', array( $this, 'populate_extras' ), 10, 2 );
 	}
 }
diff --git src/bp-xprofile/bp-xprofile-filters.php src/bp-xprofile/bp-xprofile-filters.php
index 1ae80c0..f812cdd 100644
--- src/bp-xprofile/bp-xprofile-filters.php
+++ src/bp-xprofile/bp-xprofile-filters.php
@@ -200,7 +200,7 @@ function xprofile_filter_pre_validate_value_by_field_type( $value, $field, $fiel
 /**
  * Filter an Extended Profile field value, and attempt to make clickable links
  * to members search results out of them.
- * 
+ *
  * - Not run on datebox field types
  * - Not run on values without commas with less than 5 words
  * - URL's are made clickable