Index: src/java/org/apache/nutch/fetcher/Fetcher2.java
===================================================================
--- src/java/org/apache/nutch/fetcher/Fetcher2.java	(revision 531943)
+++ src/java/org/apache/nutch/fetcher/Fetcher2.java	(working copy)
@@ -236,7 +236,7 @@
     public FetchItem getFetchItem() {
       if (inProgress.size() >= maxThreads) return null;
       long now = System.currentTimeMillis();
-      long last = endTime.get() + (maxThreads > 1 ? crawlDelay : minCrawlDelay);
+      long last = endTime.get() + (maxThreads > 1 ? minCrawlDelay : crawlDelay);
       if (last > now) return null;
       FetchItem it = null;
       if (queue.size() == 0) return null;
@@ -771,8 +771,8 @@
     feeder.start();
 
     // set non-blocking & no-robots mode for HTTP protocol plugins.
-    getConf().setBoolean("http.plugin.check.blocking", false);
-    getConf().setBoolean("http.plugin.check.robots", false);
+    getConf().setBoolean(Protocol.CHECK_BLOCKING, false);
+    getConf().setBoolean(Protocol.CHECK_ROBOTS, false);
     
     for (int i = 0; i < threadCount; i++) {       // spawn threads
       new FetcherThread(getConf()).start();