Index: bp-activity.php
===================================================================
--- bp-activity.php	(revision 2638)
+++ bp-activity.php	(working copy)
@@ -23,8 +23,10 @@
 
 	/* Rename fields from pre BP 1.2 */
 	if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->activity->table_name}%'" ) ) {
-		$wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_action type varchar(75) NOT NULL" );
-		$wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_name component varchar(75) NOT NULL" );
+		if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_action'" ) )
+			$wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_action type varchar(75) NOT NULL" );
+		if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_name'" ) )
+			$wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_name component varchar(75) NOT NULL" );
 	}
 
 	/**
Index: bp-xprofile.php
===================================================================
--- bp-xprofile.php	(revision 2638)
+++ bp-xprofile.php	(working copy)
@@ -76,13 +76,15 @@
 	) {$charset_collate};";
 
 	if ( '' == get_site_option( 'bp-xprofile-db-version' ) ) {
-		$sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
+		if ( !$wpdb->get_var("SELECT id FROM {$bp->profile->table_name_groups} WHERE id = 1") )
+			$sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
 
-		$sql[] = "INSERT INTO {$bp->profile->table_name_fields} (
-					id, group_id, parent_id, type, name, is_required, can_delete
-				  ) VALUES (
-					1, 1, 0, 'textbox', '" . get_site_option( 'bp-xprofile-fullname-field-name' ) . "', 1, 0
-				  );";
+		if ( !$wpdb->get_var("SELECT id FROM {$bp->profile->table_name_fields} WHERE id = 1") )
+			$sql[] = "INSERT INTO {$bp->profile->table_name_fields} (
+						id, group_id, parent_id, type, name, is_required, can_delete
+					  ) VALUES (
+						1, 1, 0, 'textbox', '" . get_site_option( 'bp-xprofile-fullname-field-name' ) . "', 1, 0
+					  );";
 	}
 
 	require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );