diff --git a/autotest/CheckBak/CheckBak.cpp b/autotest/CheckBak/CheckBak.cpp
index 4ca0899dc..8af7c0fd3 100644
--- a/autotest/CheckBak/CheckBak.cpp
+++ b/autotest/CheckBak/CheckBak.cpp
@@ -49,7 +49,8 @@ CONSOLE_APP_MAIN
 	ASSERT(d >= GetSysDate() - 1);
 	ASSERT(tm >= GetSysDate() - 1);
 	len = len >> 20;
-	ASSERT(len > 2000 && len < 5800);
+	LOG("backup len (MB): " << len);
+	ASSERT(len > 1500 && len < 5800);
 
 	for(auto dir : Split("/net/nas1/bak;/net/nas/bak;/big/bak;/ssd/bak", ';')) {
 		FileIn in1(fn);
diff --git a/autotest/CompareStream/CompareStream.cpp b/autotest/CompareStream/CompareStream.cpp
index 4f5759eee..d35e7fdde 100644
--- a/autotest/CompareStream/CompareStream.cpp
+++ b/autotest/CompareStream/CompareStream.cpp
@@ -7,7 +7,7 @@ CONSOLE_APP_MAIN
 	StdLogSetup(LOG_COUT|LOG_FILE);
 	Vector<int> a, b;
 	for(int i = 0; i < 200000; i++) {
-		if(i % 100000 == 0)
+		if(i % 10000 == 0)
 			LOG(i);
 		int q = Random();
 		a.Add(q);
diff --git a/autotest/CompareStream/CompareStream.upp b/autotest/CompareStream/CompareStream.upp
index 8a4e90a01..5bd974969 100644
--- a/autotest/CompareStream/CompareStream.upp
+++ b/autotest/CompareStream/CompareStream.upp
@@ -1,3 +1,5 @@
+description "#WAIT: 10\377";
+
 uses
 	Core;
 
diff --git a/autotest/Qtf/test.pdf b/autotest/Qtf/test.pdf
index 0515fb236..543e85d37 100644
Binary files a/autotest/Qtf/test.pdf and b/autotest/Qtf/test.pdf differ
diff --git a/uppsrc/CtrlLib/EditCtrl.h b/uppsrc/CtrlLib/EditCtrl.h
index c493012b6..2f796a693 100644
--- a/uppsrc/CtrlLib/EditCtrl.h
+++ b/uppsrc/CtrlLib/EditCtrl.h
@@ -424,7 +424,7 @@ public:
 	WithSpin&          SetInc(IncType _inc = 1)     { inc = _inc; return *this; }
 	DataType           GetInc() const               { return inc; }
 	
-	WithSpin&          SetStyle(SpinButtons::Style& s) { style = &s; return *this; }
+	WithSpin&          SetStyle(const SpinButtons::Style& s) { style = &s; return *this; }
 
 	WithSpin&          OnSides(bool b = true);
 	bool               IsOnSides() const            { return style->onsides; }
diff --git a/upptst/Annotations/main.cpp b/upptst/Annotations/main.cpp
index 371142374..a8ff44237 100644
--- a/upptst/Annotations/main.cpp
+++ b/upptst/Annotations/main.cpp
@@ -1,5 +1,7 @@
 #include <CtrlLib/CtrlLib.h>
 
+// this is for testing TheIDE annotations
+
 using namespace Upp;
 /*
 	STRUCT,
@@ -66,15 +68,6 @@ struct Struct {
 
 String Struct::meta_attribute;
 
-void Struct::Method(String param)
-{
-	String x;
-}
-
-void Struct::Test()
-{
-}
-
 void Struct::ClassMethod(int param)
 {
 }
@@ -95,12 +88,6 @@ Struct::~Struct()
 {
 }
 
-Struct h;
-
-void Foo() {
-	h.
-}
-
 class Class {
 	int x;
 	
@@ -117,6 +104,8 @@ struct TemplateFoo {
 	int y;
 };
 
+struct Foo { int bar; };
+
 typedef Foo Typedef;
 
 using UsingTypedef = Foo;
@@ -154,10 +143,6 @@ namespace Namespace {
 	
 	String Struct::meta_attribute;
 	
-	void Struct::Method(String param)
-	{
-	}
-	
 	void Struct::ClassMethod(int param)
 	{
 	}