Index: bp-core/admin/bp-core-upgrade.php
===================================================================
--- bp-core/admin/bp-core-upgrade.php	(revision 3342)
+++ bp-core/admin/bp-core-upgrade.php	(working copy)
@@ -484,15 +484,15 @@
 		<table class="form-table">
 			<tr>
 				<th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[1] ) ) : ?> checked="checked" <?php endif; ?>value="<?php echo esc_attr( $structures[1] ); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />&nbsp;<?php _e('Day and name'); ?></label></th>
-				<td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
+				<td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
 			</tr>
 			<tr>
 				<th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[2] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[2] ); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />&nbsp;<?php _e('Month and name'); ?></label></th>
-				<td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
+				<td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
 			</tr>
 			<tr>
 				<th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[3] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[3] ); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> />&nbsp;<?php _e('Numeric'); ?></label></th>
-				<td><code><?php echo get_option('home') . $prefix ?>/archives/123</code></td>
+				<td><code><?php echo get_home_url() . $prefix ?>/archives/123</code></td>
 			</tr>
 		</table>
 
Index: bp-core/bp-core-avatars.php
===================================================================
--- bp-core/bp-core-avatars.php	(revision 3342)
+++ bp-core/bp-core-avatars.php	(working copy)
@@ -567,7 +567,7 @@
 
 	// If multisite, and current blog does not match root blog, make adjustments
 	if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
-		$upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
+		$upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
 
 	return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
 }
Index: bp-core.php
===================================================================
--- bp-core.php	(revision 3342)
+++ bp-core.php	(working copy)
@@ -614,9 +614,9 @@
 	global $current_blog;
 
 	if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
-		$domain = get_blog_option( $current_blog->blog_id, 'home' );
+		$domain = get_home_url( $current_blog->blog_id );
 	else
-		$domain = get_blog_option( BP_ROOT_BLOG, 'home' );
+		$domain = get_home_url( BP_ROOT_BLOG );
 
 	return apply_filters( 'bp_core_get_root_domain', $domain );
 }