diff --git a/tpot/config/classifier.py b/tpot/config/classifier.py
index f720d850..adc82550 100644
--- a/tpot/config/classifier.py
+++ b/tpot/config/classifier.py
@@ -81,7 +81,8 @@
     'sklearn.neighbors.KNeighborsClassifier': {
         'n_neighbors': range(1, 101),
         'weights': ["uniform", "distance"],
-        'p': [1, 2]
+        'p': [1, 2],
+        'algorithm': ["kd_tree", "ball_tree"]  # using "brute" results in memory spikes
     },
 
     'sklearn.svm.LinearSVC': {
@@ -192,6 +193,13 @@
         }
     },
 
+    'sklearn.feature_selection.SelectFdr': {
+        'alpha': np.arange(0, 0.05, 0.001),
+        'score_func': {
+            'sklearn.feature_selection.f_classif': None
+        }
+    },
+
     'sklearn.feature_selection.SelectPercentile': {
         'percentile': range(1, 100),
         'score_func': {
diff --git a/tpot/config/regressor.py b/tpot/config/regressor.py
index 8e9d2eb7..af2df089 100644
--- a/tpot/config/regressor.py
+++ b/tpot/config/regressor.py
@@ -69,7 +69,8 @@
     'sklearn.neighbors.KNeighborsRegressor': {
         'n_neighbors': range(1, 101),
         'weights': ["uniform", "distance"],
-        'p': [1, 2]
+        'p': [1, 2],
+        'algorithm': ["kd_tree", "ball_tree"]  # using "brute" results in memory spikes
     },
 
     'sklearn.linear_model.LassoLarsCV': {
@@ -186,6 +187,13 @@
         }
     },
 
+    'sklearn.feature_selection.SelectFdr': {
+        'alpha': np.arange(0, 0.05, 0.001),
+        'score_func': {
+            'sklearn.feature_selection.f_regression': None
+        }
+    },
+
     'sklearn.feature_selection.SelectPercentile': {
         'percentile': range(1, 100),
         'score_func': {