diff --git a/libbitdht/src/bitdht/bdmanager.cc b/libbitdht/src/bitdht/bdmanager.cc
index 439b6f769..f4a663753 100644
--- a/libbitdht/src/bitdht/bdmanager.cc
+++ b/libbitdht/src/bitdht/bdmanager.cc
@@ -272,11 +272,12 @@ void bdNodeManager::iteration()
 			 * if, after 60 secs, we haven't reached MIN_OP_SPACE_SIZE, restart....
 			 */
 			
-#define TRANSITION_OP_SPACE_SIZE	100 /* 1 query / sec, should take 12-15 secs */
-//#define MAX_FINDSELF_TIME		60
-//#define MIN_OP_SPACE_SIZE		20 
-#define MAX_FINDSELF_TIME		10
-#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
+#define TRANSITION_OP_SPACE_SIZE	50 /* 1 query / sec, should take 12-15 secs */
+#define MAX_FINDSELF_TIME		30
+#define MIN_OP_SPACE_SIZE		10
+// testing parameters.
+//#define MAX_FINDSELF_TIME		10
+//#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
 
 			{
 				uint32_t nodeSpaceSize = mNodeSpace.calcSpaceSize();
diff --git a/libbitdht/src/bitdht/bdnode.cc b/libbitdht/src/bitdht/bdnode.cc
index d506fb71c..17b5fce26 100644
--- a/libbitdht/src/bitdht/bdnode.cc
+++ b/libbitdht/src/bitdht/bdnode.cc
@@ -79,7 +79,8 @@ void bdNode::init()
  	std::list<bdFilteredPeer> emptyList;
 	mFilterPeers = new bdFilter(&mOwnId, emptyList, BITDHT_FILTER_REASON_OWNID, mFns);
 	
-	setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT);
+	//setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT);
+	setNodeOptions(0);
 
 }
 
diff --git a/libbitdht/src/util/bdbloom.cc b/libbitdht/src/util/bdbloom.cc
index e6dbe3a58..2772e937e 100644
--- a/libbitdht/src/util/bdbloom.cc
+++ b/libbitdht/src/util/bdbloom.cc
@@ -27,8 +27,10 @@
 
 #include <sstream>
 #include <iomanip>
-#include <malloc.h>
 
+#if defined(_WIN32) || defined(__MINGW32__)
+	#include <malloc.h>
+#endif
 /* Bloom Filter implementation */