diff --git a/wp-includes/query.php b/wp-includes/query.php
index d2964ca5a..67bfa16ce 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1060,7 +1060,7 @@ class WP_Query {
 			$cwhere = apply_filters('comment_feed_where', $cwhere);
 			$cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
 
-			$this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss'));
+			$this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'));
 			$this->comment_count = count($this->comments);
 
 			$post_ids = array();
@@ -1099,7 +1099,7 @@ class WP_Query {
 		if ( $this->is_comment_feed && $this->is_singular ) {
 			$cjoin = apply_filters('comment_feed_join', '');
 			$cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = {$this->posts[0]->ID} AND comment_approved = '1'");
-			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss');
+			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss');
 			$this->comments = $wpdb->get_results($comments_request);
 			$this->comment_count = count($this->comments);
 		}
diff --git a/wp-login.php b/wp-login.php
index e69d559a5..5acae1628 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -195,7 +195,7 @@ case 'rp' :
 	} else {
 		// send a copy of password change notification to the admin
 		// but check to see if it's the admin whose password we're changing, and skip this
-		if ($user->user_email != get_settings('admin_email')) {
+		if ($user->user_email != get_option('admin_email')) {
 			$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
 			wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
 		}