diff --git a/project.xml b/project.xml
index 493618817..ff5d2536c 100644
--- a/project.xml
+++ b/project.xml
@@ -284,6 +284,9 @@
     <contributor>
       <name>Leo Sutic</name>
     </contributor>
+    <contributor>
+      <name>Chris Tilden</name>
+    </contributor>
     <contributor>
       <name>Neil O'Toole</name>
     </contributor>
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 08b924c60..a5f53b0c0 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry;
  * UnsupportedOperationException on attempts to call that method.
  *
  * @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0)
- * @version $Revision: 1.14 $ $Date: 2004/05/26 21:58:02 $
+ * @version $Revision: 1.15 $ $Date: 2004/11/12 00:02:58 $
  * 
  * @author Marc Johnson
  * @author Stephen Colebourne
@@ -1612,7 +1612,7 @@ public class TreeBidiMap implements OrderedBidiMap {
             expectedModifications++;
             lastReturnedNode = null;
             if (nextNode == null) {
-                previousNode = main.greatestNode(main.rootNode[orderType], orderType);
+                previousNode = TreeBidiMap.greatestNode(main.rootNode[orderType], orderType);
             } else {
                 previousNode = main.nextSmaller(nextNode, orderType);
             }
@@ -1674,7 +1674,7 @@ public class TreeBidiMap implements OrderedBidiMap {
          */
         EntryView(final TreeBidiMap main, final int orderType, final int dataType) {
             super(main, orderType, dataType);
-            this.oppositeType = main.oppositeIndex(orderType);
+            this.oppositeType = TreeBidiMap.oppositeIndex(orderType);
         }
         
         public boolean contains(Object obj) {
@@ -1979,14 +1979,14 @@ public class TreeBidiMap implements OrderedBidiMap {
             if (main.nodeCount == 0) {
                 throw new NoSuchElementException("Map is empty");
             }
-            return main.leastNode(main.rootNode[VALUE], VALUE).getValue();
+            return TreeBidiMap.leastNode(main.rootNode[VALUE], VALUE).getValue();
         }
 
         public Object lastKey() {
             if (main.nodeCount == 0) {
                 throw new NoSuchElementException("Map is empty");
             }
-            return main.greatestNode(main.rootNode[VALUE], VALUE).getValue();
+            return TreeBidiMap.greatestNode(main.rootNode[VALUE], VALUE).getValue();
         }
     
         public Object nextKey(Object key) {
diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
index 6326a75e5..092c288d0 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  * 
  * @author Janek Bogucki
  * @author Phil Steitz
@@ -380,7 +380,7 @@ public class TestBlockingBuffer extends AbstractTestObject {
 
             try {
                 // wait for other thread to block on get() or remove()
-                Thread.currentThread().sleep(100);
+                Thread.sleep(100);
             }
             catch (InterruptedException e) {}
 
@@ -403,7 +403,7 @@ public class TestBlockingBuffer extends AbstractTestObject {
 
             try {
                 // wait for other thread to block on get() or remove()
-                Thread.currentThread().sleep(100);
+                Thread.sleep(100);
             }
             catch (InterruptedException e) {}
 
@@ -481,7 +481,7 @@ public class TestBlockingBuffer extends AbstractTestObject {
 
     private void delay(){
         try {
-            Thread.currentThread().sleep(100);
+            Thread.sleep(100);
         } catch (InterruptedException e) {}
     }