diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp
index 667fe25727144d79c5ef31d1a6af44fafef5ed3b..8bf123325cd519d8f9e4eee3ae10905d5322ebc3 100644
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -607,7 +607,7 @@ cvtScale_( const T* src, size_t sstep,
 }
 
 //vz optimized template specialization
-template<> static void
+template<> void
 cvtScale_<short, short, float>( const short* src, size_t sstep,
            short* dst, size_t dstep, Size size,
            float scale, float shift )   
diff --git a/modules/stitching/perf/perf_stich.cpp b/modules/stitching/perf/perf_stich.cpp
index e7bbd400dd97820692f0383aadb6481fc1af1bed..ed60a36aa681828fb5b0629ed2141aef1fb12992 100644
--- a/modules/stitching/perf/perf_stich.cpp
+++ b/modules/stitching/perf/perf_stich.cpp
@@ -32,7 +32,7 @@ PERF_TEST_P( stitch, a123, testing::Values("surf", "orb"))
             ? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE)
             : new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE);
 
-    declare.time(30 * 20).iterations(50);
+    declare.time(30 * 20).iterations(20);
 
     while(next())
     {
@@ -65,7 +65,7 @@ PERF_TEST_P( stitch, b12, testing::Values("surf", "orb"))
             ? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE)
             : new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE);
 
-    declare.time(30 * 20).iterations(50);
+    declare.time(30 * 20).iterations(20);
 
     while(next())
     {
diff --git a/modules/ts/misc/summary.py b/modules/ts/misc/summary.py
index b7b9ab07d15d29c2d13a0044bbdf8697fe8d7fe9..2a6fa4b1d913cb96ce84b6a567cfc42f0ab2dab8 100644
--- a/modules/ts/misc/summary.py
+++ b/modules/ts/misc/summary.py
@@ -14,7 +14,7 @@ def getSetName(tset, idx, columns, short = True):
         return prefix
     name = tset[0].replace(".xml","").replace("_", "\n")
     if prefix:
-        return prefix + "\n" + ("-"*int(len(prefix)*1.7)) + "\n" + name
+        return prefix + "\n" + ("-"*int(len(max(prefix.split("\n"), key=len))*1.5)) + "\n" + name
     return name
 
 if __name__ == "__main__":
@@ -43,7 +43,7 @@ if __name__ == "__main__":
         options.calc_relatives = False
         options.calc_cr = False
     if options.columns:
-        options.columns = [s.strip() for s in options.columns.split(",")]
+        options.columns = [s.strip().replace("\\n", "\n") for s in options.columns.split(",")]
     
     # expand wildcards and filter duplicates
     files = []