diff --git bp-core/admin/bp-core-components.php bp-core/admin/bp-core-components.php
index bca1c39..96f9e39 100644
--- bp-core/admin/bp-core-components.php
+++ bp-core/admin/bp-core-components.php
@@ -420,5 +420,5 @@ function bp_core_admin_get_components( $type = 'all' ) {
 
 	}
 
-	return $components;
+	return apply_filters( 'bp_core_admin_get_components', $components, $type );
 }
diff --git bp-core/bp-core-avatars.php bp-core/bp-core-avatars.php
index a6e638f..bbff387 100644
--- bp-core/bp-core-avatars.php
+++ bp-core/bp-core-avatars.php
@@ -764,7 +764,7 @@ function bp_core_avatar_handle_crop( $args = '' ) {
 		$new_avatar_path      = str_replace( $upload_dir['basedir'], '', $original_file );
 
 		if ( $existing_avatar_path !== $new_avatar_path ) {
-			bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
+			bp_core_delete_existing_avatar( array( 'object' => $object, 'item_id' => $item_id, 'avatar_path' => $avatar_folder_dir ) );
 		}
 	}
 
diff --git bp-core/bp-core-loader.php bp-core/bp-core-loader.php
index 7dd0f51..29affc3 100644
--- bp-core/bp-core-loader.php
+++ bp-core/bp-core-loader.php
@@ -110,6 +110,8 @@ class BP_Core extends BP_Component {
 
 		// Add Core to required components
 		$bp->required_components[] = 'core';
+
+		do_action( 'bp_core_components_included' );
 	}
 
 	/**