diff --git a/bazaar/BufferStream/BufferStream.cpp b/bazaar/BufferStream/BufferStream.cpp
index 454d60588..83a87667e 100644
--- a/bazaar/BufferStream/BufferStream.cpp
+++ b/bazaar/BufferStream/BufferStream.cpp
@@ -29,7 +29,7 @@ void BufferStream::Seek(int64 pos)
 void BufferStream::Open(Vector<byte> & d)
 {
 	if(&data != &d)
-		data = d; //pick
+		data = pick(d); //pick
 	MemStream::Create((byte*)data, data.GetCount());
 }
 
@@ -43,7 +43,7 @@ void BufferStream::Create()
 Vector<byte> BufferStream::GetResult()
 {
 	data.SetCount((int)GetPos());
-	Vector<byte> d = data; //pick
+	Vector<byte> d = pick(data); //pick
 	Create();
 	return d;
 }
diff --git a/bazaar/FSMon/FSMonPosix.cpp b/bazaar/FSMon/FSMonPosix.cpp
index 63b20688b..732daecde 100644
--- a/bazaar/FSMon/FSMonPosix.cpp
+++ b/bazaar/FSMon/FSMonPosix.cpp
@@ -255,7 +255,7 @@ void FSMon::EventsSelector(uint32 mask, String const &path, String const &newPat
 							oldPth = newPath + oldPth.Mid(path.GetCount());
 						paths.Add(oldPth);
 					}
-					monitoredPaths = paths;
+					monitoredPaths = pick(paths);
 				}
 			}
 		}
@@ -513,7 +513,7 @@ Vector<FSMon::Info> FSMon::GetChanged(void)
 	Vector<Info> info;
 	INTERLOCKED_(fsmMutex)
 	{
-		info = changed;
+		info = pick(changed);
 		changed.Clear();
 	}
 	return info;
@@ -532,7 +532,7 @@ Index<String> FSMon::GetOpenedFiles(void)
 		
 VectorMap<String, int> FSMon::GetErrorMap(void)
 {
-	VectorMap<String, int> res = errMap;
+	VectorMap<String, int> res = pick(errMap);
 	errMap.Clear();
 	return res;
 }
diff --git a/bazaar/GoogleTranslator/GoogleTranslator.cpp b/bazaar/GoogleTranslator/GoogleTranslator.cpp
index a2f1afb64..43230f488 100644
--- a/bazaar/GoogleTranslator/GoogleTranslator.cpp
+++ b/bazaar/GoogleTranslator/GoogleTranslator.cpp
@@ -180,7 +180,7 @@ String GoogleTranslator::GetFormatedText(){
 				if(text_temp_pos1==-1)
 					text_temp_pos1= text_temp.GetLength();
 				
-				if(text_temp_pos,text_temp_pos1 - text_temp_pos >1){
+				if(text_temp_pos1 - text_temp_pos >1){
 					formatedText<<text_lf;
 					formatedText<<t_(text_temp.Mid(text_temp_pos,text_temp_pos1 - text_temp_pos))<<String(":").Cat();
 				}
diff --git a/bazaar/GoogleTranslatorDemo/GlobalShortCut.h b/bazaar/GoogleTranslatorDemo/GlobalShortCut.h
index 599afe4da..ee9626854 100644
--- a/bazaar/GoogleTranslatorDemo/GlobalShortCut.h
+++ b/bazaar/GoogleTranslatorDemo/GlobalShortCut.h
@@ -45,7 +45,8 @@ inline bool get_key_state(dword p_k){
 			
 		if((result)&&(p_k & K_CTRL))
 			result &= GetCtrl();
-	#elif PLATFORM_X11
+	#else
+	#ifdef PLATFORM_X11
 		result = true;
 		char key_map_stat[32];
 		XQueryKeymap(Xdisplay, key_map_stat);
diff --git a/bazaar/IPNServer/IPNServer.cpp b/bazaar/IPNServer/IPNServer.cpp
index 9e93f74fd..58dbfddb0 100644
--- a/bazaar/IPNServer/IPNServer.cpp
+++ b/bazaar/IPNServer/IPNServer.cpp
@@ -55,14 +55,9 @@ void IPNServer::OnRequest()
 		// the rest is just HTTP headers and can be discarded
 		// in detail, the LAST part of req string must be "VERIFIED"
 		if(req.Right(8) == "VERIFIED")
-		{
-			VectorMap<String, String> data;
-			for(int i = 0; i < post.GetCount(); i++)
-				data.Add(ToUpper(post.GetKey(i)), post[i]);
-			onVerified(data);
-		}
+			WhenVerified();
 		else
-			onInvalid();
+			WhenInvalid();
 	}
 	else
 		Cout() << "No POST data on PayPal request\n";
@@ -73,6 +68,14 @@ void IPNServer::OnRequest()
 	clientSock.Write("Content-Type: text/plain\r\n\r\n");
 }
 
+VectorMap<String, String> IPNServer::GetVerified() const
+{
+	VectorMap<String, String> data;
+	for(int i = 0; i < post.GetCount(); i++)
+		data.Add(ToUpper(post.GetKey(i)), post[i]);
+	return data;
+}
+
 void IPNServer::OnClosed()
 {
 	Cout() << "Connection with " << FormatIP(clientIP) << " closed\n";
diff --git a/bazaar/IPNServer/IPNServer.h b/bazaar/IPNServer/IPNServer.h
index 4b196bc62..3e443e143 100644
--- a/bazaar/IPNServer/IPNServer.h
+++ b/bazaar/IPNServer/IPNServer.h
@@ -15,14 +15,10 @@ class IPNServer : public ScgiServer
 		
 		String payServer;
 		int payPort;
-		
-	// 'VERIFIED' answer handler
-	Callback1<VectorMap<String, String> >onVerified;
-	
-	// 'INVALID' answer handler
-	Callback onInvalid;
 
 public:
+	Callback WhenVerified;
+	Callback WhenInvalid;
 
 	// constructor - defaults to port 8787
 	IPNServer(int port = 8787);
@@ -32,12 +28,13 @@ public:
 	IPNServer &SetPayPort(int p) { payPort = p; return *this; }
 	
 	// setting of handler
-	IPNServer &SetVerifiedHandler(Callback1<VectorMap<String, String> >handler) { onVerified = handler; return *this; }
-	IPNServer &SetInvalidHandler(Callback handler) { onInvalid = handler; return *this; }
+	IPNServer &SetVerifiedHandler(Callback handler) { WhenVerified = handler; return *this; }
+	IPNServer &SetInvalidHandler(Callback handler)  { WhenInvalid = handler; return *this; }
 	
 	// runs the server
 	void Run(void);
-	
+
+	VectorMap<String, String> GetVerified() const;
 };
 
 END_UPP_NAMESPACE
diff --git a/bazaar/IPNServerTest/IPNServerTest.cpp b/bazaar/IPNServerTest/IPNServerTest.cpp
index 56ae278e2..a7a1334b4 100644
--- a/bazaar/IPNServerTest/IPNServerTest.cpp
+++ b/bazaar/IPNServerTest/IPNServerTest.cpp
@@ -50,8 +50,9 @@ static bool Daemonize(void)
 #endif
 #endif
 
-void OnVerified(VectorMap<String, String> data)
+void OnVerified(IPNServer *s)
 {
+	VectorMap<String, String> data = s->GetVerified();
 	Cout() << "DUMP OF TRANSACTION DATA:\n\n";
 	for(int i = 0; i < data.GetCount(); i++)
 		Cout() << data.GetKey(i) << "=" << data[i] << "\n";
@@ -88,7 +89,7 @@ CONSOLE_APP_MAIN
 	
 	// setup handlers for VERIFIED and INVALID paypal messages
 	server
-		.SetVerifiedHandler(STDBACK(OnVerified))
+		.SetVerifiedHandler(STDBACK1(OnVerified, &server))
 		.SetInvalidHandler(STDBACK(OnInvalid))
 	;
 	
diff --git a/bazaar/StylerTest/main.cpp b/bazaar/StylerTest/main.cpp
index 34e6ff509..f7248992f 100644
--- a/bazaar/StylerTest/main.cpp
+++ b/bazaar/StylerTest/main.cpp
@@ -146,15 +146,15 @@ void StylerTest::InitDummys()
 	ed = 10.3;
 	
 	einn <<= 100;
-	ei64nn <<= 22342599399929;
+	ei64nn <<= (int64)22342599399929;
 	ednn <<= 10.3;
 
 	eis <<= 100;
-	ei64s <<= 22342599399929;
+	ei64s <<= (int64)22342599399929;
 	eds <<= 10.3;
 
 	einns <<= 100;
-	ei64nns <<= 22342599399929;
+	ei64nns <<= (int64)22342599399929;
 	ednns <<= 10.3;
 	
 	edt <<= GetSysDate();
diff --git a/bazaar/SysInfo/SysInfo.cpp b/bazaar/SysInfo/SysInfo.cpp
index 3dc4cc369..cb4bcfd85 100644
--- a/bazaar/SysInfo/SysInfo.cpp
+++ b/bazaar/SysInfo/SysInfo.cpp
@@ -571,6 +571,7 @@ bool GetProcessorInfo(int number, String &vendor, String &identifier, String &ar
 	architecture << " Family " << family << " Model " << model << " Stepping " << stepping;		// And 64 bits ?? uname -m
 	cpu.GoAfter_Init("cpu MHz", ":");
 	speed = cpu.GetInt();
+	return true;
 }
 
 static double GetCpuTemperatureACPI() {
@@ -582,11 +583,12 @@ static double GetCpuTemperatureACPI() {
 	int count = 0;
 	while (true) {
 		line = info.GetLine();
-		if (line.IsEmpty())
+		if (line.IsEmpty()) {
 			if (info.Eof())
 				break;
 			else
 				continue;
+		}
 		if (!line.GoAfter("Thermal", "ok,"))
 			continue;
 		double temp = line.GetDouble();
@@ -597,7 +599,7 @@ static double GetCpuTemperatureACPI() {
 	}
 	if (count == 0)
 		return Null;
-	return tempAcc/count;	
+	return tempAcc/count;
 }
 
 static double GetCpuTemperatureSensors() {
diff --git a/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tpp b/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tpp
index 878268c79..977149f01 100644
--- a/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tpp
+++ b/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tpp
@@ -28,7 +28,8 @@ internals.&]
 [s0; &]
 [s0; [@6 IMPORTANT]: Before compiling please check [*/ 2. Compiler support 
 and Requirements] in [^topic`:`/`/SysInfo`/srcimp`/SysInfo`$en`-us^ Implementation 
-details.]&]
+details.] In X11, SysInfo requires XTest extension (in debian 
+based system, you need to install libxtst`-dev package).&]
 [s0; &]
 [s0; It includes functions for:&]
 [s0; &]
diff --git a/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tppi b/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tppi
index 51b548c56..668b743a9 100644
--- a/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tppi
+++ b/bazaar/SysInfo/srcdoc.tpp/SysInfo$en-us.tppi
@@ -1,9 +1,9 @@
 TITLE("General description")
 COMPRESSED
-120,156,189,85,237,110,219,70,16,124,149,3,228,6,142,75,219,183,247,125,100,81,36,177,147,198,64,18,27,118,138,254,16,20,147,162,206,14,97,74,84,73,170,105,80,52,207,222,57,138,142,147,182,65,27,184,168,5,145,242,138,123,51,59,59,187,154,10,182,179,195,19,62,225,255,240,151,30,135,171,98,83,247,179,105,45,156,203,42,34,193,179,130,108,118,234,179,15,31,62,28,144,226,46,139,135,17,14,35,174,36,9,66,140,43,97,73,123,238,181,35,199,165,85,66,91,174,211,117,209,22,203,217,180,112,50,219,59,55,200,18,137,158,72,146,196,201,8,133,167,184,228,66,145,208,228,156,34,171,157,244,198,164,101,177,238,171,102,53,155,62,87,217,60,166,42,100,74,100,114,235,140,34,228,41,45,164,213,10,249,74,129,161,4,182,53,214,166,125,213,215,97,54,173,34,117,16,62,138,68,85,98,38,32,40,44,50,149,80,70,73,39,36,57,33,140,151,202,43,48,39,145,86,125,0,207,185,18,89,129,119,76,211,192,83,90,145,132,40,202,106,137,199,44,238,138,
-123,18,0,117,92,107,224,133,95,111,149,154,67,163,168,83,204,53,128,20,86,199,12,167,28,73,235,132,18,70,128,4,183,168,53,50,208,233,34,116,37,114,165,160,236,232,145,206,8,121,54,177,19,193,61,23,198,122,224,129,43,202,149,222,147,116,192,83,164,57,201,180,108,22,40,113,46,52,151,3,152,67,35,12,14,29,20,209,134,192,87,72,7,52,75,82,226,170,149,179,105,23,98,43,250,166,157,77,247,30,237,242,3,126,32,180,126,24,211,61,210,157,84,82,42,227,21,113,9,24,156,161,162,92,134,163,153,164,133,75,231,69,7,204,65,78,138,46,130,224,210,105,9,80,131,11,250,137,170,36,68,17,94,57,41,29,79,203,186,232,186,81,153,168,202,94,44,143,40,33,154,216,40,168,150,66,249,168,136,20,80,86,24,237,9,210,106,163,184,72,219,240,243,166,106,195,50,172,160,109,5,91,100,183,125,25,61,8,102,91,11,138,132,4,76,168,141,225,81,41,13,23,8,169,161,50,39,167,192,8,47,244,182,31,93,56,39,99,183,150,32,153,144,156,120,161,
-36,152,120,165,80,59,14,32,79,68,220,225,133,202,160,200,96,10,26,221,52,194,111,211,85,66,106,98,97,95,244,200,171,8,239,101,84,78,64,120,97,184,70,7,196,54,93,68,189,197,14,20,39,225,226,123,208,156,116,66,152,3,80,36,173,81,183,132,200,194,161,118,13,213,229,224,107,178,46,125,21,222,117,199,69,31,70,151,236,29,237,108,237,69,38,33,51,225,49,95,59,143,214,145,138,250,73,165,188,240,82,106,225,181,52,28,58,118,219,65,142,201,113,142,134,49,252,120,136,77,200,98,162,80,171,214,168,126,72,67,229,150,34,21,225,188,137,42,140,135,228,251,117,181,138,60,224,9,28,241,45,145,141,71,56,204,136,115,134,75,15,25,80,61,215,48,54,86,128,67,139,209,97,1,215,199,29,80,222,20,215,33,223,31,135,115,0,143,174,211,82,187,232,85,100,130,52,224,113,142,231,220,32,226,28,134,39,189,46,214,163,233,4,79,4,135,115,176,107,52,166,15,40,176,28,247,113,111,96,5,64,117,172,29,175,183,174,203,247,87,161,235,195,2,13,215,
-124,40,85,80,34,8,122,193,115,90,59,165,12,152,2,213,198,53,20,219,134,73,213,86,166,103,5,166,227,183,203,223,191,121,250,106,255,199,11,54,237,68,198,46,222,119,39,171,171,230,193,108,218,241,140,61,219,172,202,184,153,58,214,55,236,58,244,172,194,119,237,178,136,49,86,172,22,236,45,46,117,96,199,161,187,233,155,117,194,78,47,198,112,187,120,87,180,1,207,247,161,93,21,117,119,48,158,56,222,166,143,12,59,121,121,118,122,254,250,241,171,215,179,148,61,9,56,55,176,178,89,174,43,40,127,205,214,117,192,8,178,242,109,40,111,216,116,239,144,137,3,118,52,124,27,90,214,109,214,235,166,237,7,168,243,187,225,233,102,192,99,211,55,96,82,149,121,154,31,230,135,99,57,249,97,215,150,213,114,125,23,216,9,171,124,127,211,189,97,39,75,64,197,236,109,81,139,208,23,21,232,206,62,231,123,18,75,47,235,13,118,24,187,250,40,10,56,167,159,61,87,97,99,101,167,177,190,47,145,248,11,131,124,242,67,232,71,253,158,53,245,34,180,249,110,254,
-240,13,59,157,131,200,42,74,209,173,67,89,21,53,208,226,183,221,236,126,80,136,97,76,135,240,238,69,223,2,32,127,144,39,127,247,9,189,195,13,84,158,143,221,76,216,147,147,177,193,184,69,43,220,147,203,79,213,106,209,188,235,94,84,93,159,239,62,110,219,226,125,254,93,221,0,253,251,136,255,165,192,200,240,223,135,80,194,89,219,148,161,235,182,126,69,252,62,196,183,172,243,75,20,112,30,74,48,31,24,38,195,245,193,23,239,32,49,150,251,159,144,120,217,108,186,48,112,56,107,186,145,194,103,96,195,3,67,175,110,194,251,121,131,22,254,63,184,23,101,27,194,138,181,161,108,218,197,61,193,94,52,197,226,25,38,62,191,188,40,174,194,71,191,198,234,170,174,12,117,93,172,2,248,220,77,228,159,166,246,180,127,139,109,177,198,50,238,88,117,181,93,70,88,149,12,94,254,218,185,93,52,119,4,143,195,242,147,5,114,251,212,229,2,225,25,10,255,165,194,207,24,3,52,139,17,54,254,28,124,21,208,235,230,248,19,132,248,31,171,49,36,183,229,205,102,
-127,0,27,101,44,213,
+120,156,189,85,13,79,220,70,16,253,43,43,29,141,8,53,176,179,223,246,85,85,210,208,52,72,73,64,64,213,72,167,11,246,249,22,98,225,179,175,94,147,4,85,205,111,239,91,159,9,73,219,168,141,168,202,233,108,24,123,246,189,121,243,102,152,9,182,181,197,19,62,225,255,240,147,29,248,139,226,186,238,231,179,90,56,55,173,136,4,159,22,100,167,71,233,244,195,135,15,123,164,184,155,198,195,8,135,17,87,146,4,33,198,149,176,164,83,158,106,71,142,75,171,132,182,92,103,235,162,43,86,243,89,225,228,116,231,196,32,75,36,122,34,73,18,39,35,20,222,226,146,11,69,66,147,115,138,172,118,50,53,38,43,139,117,95,181,205,124,246,76,77,23,49,85,33,83,34,147,91,103,20,33,79,105,33,173,86,200,87,10,12,37,176,173,177,54,235,171,190,246,243,89,21,169,131,240,147,72,84,37,102,2,130,194,34,83,9,101,148,116,66,146,19,194,164,82,165,10,204,73,100,85,239,193,115,161,196,180,192,55,166,105,224,41,173,72,66,20,101,181,196,107,22,119,
+197,83,18,0,117,92,107,224,249,247,183,74,45,160,81,212,41,230,26,64,10,171,99,134,83,142,164,117,66,9,35,64,130,91,212,26,25,232,108,233,67,137,92,41,104,250,228,145,158,18,242,108,98,39,130,167,92,24,155,2,15,92,81,174,76,83,146,14,120,138,52,39,153,149,237,18,37,46,132,230,114,0,115,104,132,193,161,131,34,218,16,248,10,233,128,102,73,74,92,181,114,54,11,62,182,162,111,187,249,108,231,209,54,223,227,123,66,235,135,49,61,69,186,147,74,74,101,82,69,92,2,6,103,168,40,151,225,104,38,105,225,178,69,17,128,57,200,73,209,69,16,92,58,45,1,106,112,65,63,81,149,132,40,34,85,78,74,199,179,178,46,66,24,149,137,170,236,196,242,136,18,162,137,141,130,106,41,84,26,21,145,2,202,10,163,83,130,180,218,40,46,178,206,255,122,93,117,126,229,27,104,91,193,22,211,219,190,140,30,4,179,141,5,69,66,2,38,212,198,240,168,148,134,11,132,212,80,153,147,83,96,132,15,122,219,143,46,92,144,177,27,75,144,76,72,78,
+82,161,36,152,164,74,161,118,28,64,41,17,113,135,15,42,131,34,131,41,104,116,211,8,191,73,87,9,169,137,133,125,209,163,84,69,248,84,70,229,4,132,23,134,107,116,64,108,210,69,212,91,108,65,113,18,46,126,7,205,73,39,132,57,0,69,210,26,117,75,136,44,28,106,215,80,93,14,190,38,235,178,151,254,93,56,40,122,63,186,100,231,201,214,198,94,100,18,50,19,30,243,181,75,209,58,82,81,63,169,84,42,82,41,181,72,181,52,28,58,134,205,32,199,228,56,71,195,24,126,60,196,38,100,49,81,168,85,107,84,63,164,161,114,75,145,138,112,169,137,42,140,135,228,187,117,213,68,30,240,4,142,248,150,200,198,35,28,102,196,57,195,101,10,25,80,61,215,48,54,86,128,67,139,209,97,1,215,199,29,80,94,21,151,62,223,29,135,115,0,143,174,211,82,187,232,85,100,130,52,224,113,78,202,185,65,196,57,12,79,118,89,172,71,211,9,158,8,14,231,96,215,104,76,31,80,96,57,158,198,189,129,21,0,213,177,118,82,189,113,93,190,219,248,208,251,
+37,26,174,249,80,170,160,68,16,244,130,231,180,118,74,25,48,5,170,141,107,40,182,13,147,170,173,204,142,11,76,199,111,231,191,127,243,227,203,221,159,79,217,44,136,41,59,189,9,135,205,69,251,96,62,11,124,202,158,94,55,101,220,76,129,245,45,187,244,61,171,240,172,91,21,49,198,138,102,201,222,224,82,123,118,224,195,85,223,174,19,118,116,58,134,187,229,187,162,243,120,191,247,93,83,212,97,111,60,113,188,205,30,25,118,248,226,248,232,228,236,241,203,179,121,198,126,240,56,215,179,178,93,173,43,40,127,201,214,181,199,8,178,242,141,47,175,216,108,103,159,137,61,246,100,120,234,59,22,174,215,235,182,235,7,168,147,187,225,9,115,224,177,217,107,48,169,202,60,203,247,243,253,177,156,124,63,116,101,181,90,223,5,182,124,147,239,94,135,215,236,112,5,168,152,189,41,106,233,251,162,2,221,57,59,108,216,43,12,240,173,34,108,156,210,192,94,157,65,110,134,69,232,155,16,83,182,171,152,182,168,138,134,197,181,177,100,225,6,237,88,37,236,166,189,102,
+141,71,0,226,85,77,232,139,186,102,117,181,120,223,7,248,107,233,223,178,209,41,15,255,36,206,97,212,185,172,175,177,48,217,197,199,14,64,160,236,179,247,42,172,199,233,81,20,243,75,21,255,165,220,124,242,147,239,199,102,61,109,235,165,239,242,237,252,225,107,118,180,64,213,77,212,61,172,125,89,21,53,208,226,211,48,191,31,212,233,160,196,16,222,62,237,59,0,228,15,242,228,239,126,131,81,112,3,149,103,163,117,18,246,195,225,232,38,220,162,239,238,201,229,151,170,89,182,239,194,243,10,234,111,63,238,186,226,38,255,174,110,129,254,125,196,255,82,96,100,248,239,67,40,225,184,107,75,31,194,102,56,16,191,15,241,13,235,252,28,5,156,248,18,204,7,134,201,112,125,240,197,59,72,140,229,254,39,36,94,180,215,193,15,28,142,219,48,82,248,12,108,120,97,232,213,149,191,89,180,104,225,255,131,123,90,118,222,55,24,205,178,237,150,247,4,123,222,22,203,167,88,47,249,249,105,113,225,63,250,53,86,87,133,210,215,117,209,120,240,185,155,200,249,231,83,
+123,212,191,193,106,90,99,158,3,171,46,54,155,47,46,10,120,249,107,231,118,217,222,17,60,240,171,79,182,213,237,91,231,75,132,231,40,252,109,133,255,153,12,208,44,70,110,55,202,87,1,157,181,7,159,32,196,191,176,165,66,127,91,222,124,254,7,127,165,83,128,
 
diff --git a/bazaar/UnitTest++/UnitTest++.upp b/bazaar/UnitTest++/UnitTest++.upp
index 6f46e5520..533457be9 100644
--- a/bazaar/UnitTest++/UnitTest++.upp
+++ b/bazaar/UnitTest++/UnitTest++.upp
@@ -58,6 +58,3 @@ file
 	README,
 	README.original;
 
-mainconfig
-	"" = "";
-
diff --git a/bazaar/XMLMenu/XMLToolBar.h b/bazaar/XMLMenu/XMLToolBar.h
index a076b9196..6c8f10d44 100644
--- a/bazaar/XMLMenu/XMLToolBar.h
+++ b/bazaar/XMLMenu/XMLToolBar.h
@@ -162,6 +162,7 @@ class XMLToolBar : DeepCopyOption<XMLToolBar>
 		// debugging stuff -- dumps bar content
 		void Dump(int level = 0);
 #endif
+		rval_default(XMLToolBar);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////
diff --git a/bazaar/kissfir/kissfir.cpp b/bazaar/kissfir/kissfir.cpp
index 8a9009bac..7c49b16af 100644
--- a/bazaar/kissfir/kissfir.cpp
+++ b/bazaar/kissfir/kissfir.cpp
@@ -76,7 +76,7 @@ CONSOLE_APP_MAIN
     }
     fseek(filtfile,0,SEEK_END);
     nh = ftell(filtfile) / sizeof(kffsamp_t);
-    if (verbose) fprintf(stderr,"%d samples in FIR filter\n",nh);
+    if (verbose) fprintf(stderr,"%d samples in FIR filter\n",(int)nh);
     h = (kffsamp_t*)malloc(sizeof(kffsamp_t)*nh);
     fseek(filtfile,0,SEEK_SET);
     fread(h,sizeof(kffsamp_t),nh,filtfile);
diff --git a/bazaar/kissfir/kissfir.upp b/bazaar/kissfir/kissfir.upp
index 8a3123ce8..1f9dd336b 100644
--- a/bazaar/kissfir/kissfir.upp
+++ b/bazaar/kissfir/kissfir.upp
@@ -7,6 +7,5 @@ file
 	kissfir.cpp;
 
 mainconfig
-	"" = "MT",
 	"" = "MT FAST_FILT_UTIL";
 
diff --git a/bazaar/plugin/kissfft/kiss_fastfir.cpp b/bazaar/plugin/kissfft/kiss_fastfir.cpp
index 66b81dd71..3a0b09065 100644
--- a/bazaar/plugin/kissfft/kiss_fastfir.cpp
+++ b/bazaar/plugin/kissfft/kiss_fastfir.cpp
@@ -331,7 +331,7 @@ void do_file_filter(
     n_samps_buf = 8*4096/sizeof(kffsamp_t); 
     n_samps_buf = nfft + 4*(nfft-n_imp_resp+1);
 
-    if (verbose) fprintf(stderr,"bufsize=%d\n",sizeof(kffsamp_t)*n_samps_buf );
+    if (verbose) fprintf(stderr,"bufsize=%d\n",int(sizeof(kffsamp_t)*n_samps_buf));
      
 
     /*allocate space and initialize pointers */