diff --git a/python/core/symbology-ng/qgsrendererv2registry.sip b/python/core/symbology-ng/qgsrendererv2registry.sip
@@ -18,7 +18,7 @@ class QgsRendererV2AbstractMetadata
 
     /** Return new instance of the renderer given the DOM element. Returns NULL on error.
      * Pure virtual function: must be implemented in derived classes.  */
-    virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) = 0;
+    virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) = 0 /Factory/;
     /** Return new instance of settings widget for the renderer. Returns NULL on error. */
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
 

diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -125,7 +125,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
         //! take child rule out, set parent as null
         void takeChild( QgsRuleBasedRendererV2::Rule* rule );
         //! take child rule out, set parent as null
-        QgsRuleBasedRendererV2::Rule* takeChildAt( int i );
+        QgsRuleBasedRendererV2::Rule* takeChildAt( int i ) /TransferBack/;
 
       protected:
         void initFilter();
@@ -157,7 +157,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
 
-    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType ) /Factory/;
 
     virtual QgsSymbolV2List symbols();
 

diff --git a/python/core/symbology-ng/qgssymbollayerv2registry.sip b/python/core/symbology-ng/qgssymbollayerv2registry.sip
@@ -62,7 +62,7 @@ class QgsSymbolLayerV2Registry
     QgsSymbolLayerV2AbstractMetadata* symbolLayerMetadata( QString name ) const;
 
     //! register a new symbol layer type. Takes ownership of the metadata instance.
-    bool addSymbolLayerType( QgsSymbolLayerV2AbstractMetadata* metadata );
+    bool addSymbolLayerType( QgsSymbolLayerV2AbstractMetadata* metadata /Transfer/ );
 
     //! create a new instance of symbol layer given symbol layer name and properties
     QgsSymbolLayerV2* createSymbolLayer( QString name, const QgsStringMap& properties = QgsStringMap() ) const /Factory/;

diff --git a/python/gui/qgsannotationitem.sip b/python/gui/qgsannotationitem.sip
@@ -51,7 +51,7 @@ class QgsAnnotationItem: QgsMapCanvasItem
     QPointF offsetFromReferencePoint() const;
 
     /**Set symbol that is drawn on map position. Takes ownership*/
-    void setMarkerSymbol( QgsMarkerSymbolV2* symbol );
+    void setMarkerSymbol( QgsMarkerSymbolV2* symbol /Transfer/ );
     const QgsMarkerSymbolV2* markerSymbol() const;
 
     void setFrameBorderWidth( double w );

diff --git a/python/gui/qgstextannotationitem.sip b/python/gui/qgstextannotationitem.sip
@@ -8,7 +8,7 @@ class QgsTextAnnotationItem: QgsAnnotationItem
     ~QgsTextAnnotationItem();
 
     /**Returns document (caller takes ownership)*/
-    QTextDocument* document() const;
+    QTextDocument* document() const /Factory/;
     /**Sets document (does not take ownership)*/
     void setDocument( const QTextDocument* doc );
 

diff --git a/src/core/qgsrasterprojector.cpp b/src/core/qgsrasterprojector.cpp
@@ -202,7 +202,7 @@ void QgsRasterProjector::calc()
     }
     // What is the maximum reasonable size of transformatio matrix?
     // TODO: consider better when to break - ratio
-    if ( mCPRows * mCPCols > 0.0625 * mDestRows * mDestCols )
+    if ( mCPRows * mCPCols > 0.25 * mDestRows * mDestCols )
     {
       QgsDebugMsg( "Too large CP matrix" );
       mApproximate = false;

diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
@@ -32,9 +32,9 @@
 #include <QPainter>
 
 QgsRasterRenderer::QgsRasterRenderer( QgsRasterInterface* input, const QString& type )
-    : QgsRasterInterface( input ),
-    mType( type ), mOpacity( 1.0 ), mRasterTransparency( 0 ),
-    mAlphaBand( -1 ), mInvertColor( false ), mMaxOversampling( 2.0 )
+    : QgsRasterInterface( input )
+    , mType( type ), mOpacity( 1.0 ), mRasterTransparency( 0 )
+    , mAlphaBand( -1 ), mInvertColor( false ), mMaxOversampling( 2.0 )
 {
 }
 

diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp
@@ -136,6 +136,14 @@ void TestQgsWcsPublicServers::init()
       Server server( serverUrl );
       server.description = serverValue.property( "description" ).toString();
 
+      QScriptValueIterator paramsIt( serverValue.property( "params" ) );
+      while ( paramsIt.hasNext() )
+      {
+        paramsIt.next();
+        QgsDebugMsg( QString( "params value: %1" ).arg( paramsIt.value().toString() ) );
+        server.params.insert( paramsIt.name(), paramsIt.value().toString() );
+      }
+
       QScriptValue issuesValue = serverValue.property( "issues" );
 
       QScriptValueIterator issuesIt( issuesValue );
@@ -267,6 +275,7 @@ void TestQgsWcsPublicServers::test( )
 
   foreach ( QString serverUrl, serverUrls )
   {
+    Server myServer = getServer( serverUrl );
     QStringList myServerLog;
     myServerLog << "server:" + serverUrl;
     QString myServerDirName = serverUrl;
@@ -308,6 +317,11 @@ void TestQgsWcsPublicServers::test( )
         myServerUri.setParam( "version", version );
       }
 
+      foreach ( QString key, myServer.params.keys() )
+      {
+        myServerUri.setParam( key, myServer.params.value( key ) );
+      }
+
       QgsWcsCapabilities myCapabilities;
       myCapabilities.setUri( myServerUri );
 
@@ -573,7 +587,16 @@ void TestQgsWcsPublicServers::report()
     Server myServer = getServer( myServerLog.value( "server" ) );
     if ( !myServer.description.isEmpty() )
     {
-      myReport += myServer.description + "<br>";
+      myReport += myServer.description + "<br>\n";
+    }
+    if ( myServer.params.size() > 0 )
+    {
+      myReport += "<br>Additional params: ";
+      foreach ( QString key, myServer.params.keys() )
+      {
+        myReport += key + "=" + myServer.params.value( key ) + " ";
+      }
+      myReport += "<br>\n";
     }
 
     QString myServerReport;

diff --git a/tests/src/providers/testqgswcspublicservers.h b/tests/src/providers/testqgswcspublicservers.h
@@ -48,6 +48,8 @@ class TestQgsWcsPublicServers: public QObject
       QString url; // URL
       QString description; // notes
       QList<TestQgsWcsPublicServers::Issue> issues;
+      // additional params to be set on URI, e.g. IgnoreGetMapUrl
+      QMap<QString, QString> params;
     };
 
     enum OffenderType

diff --git a/tests/src/providers/wcs-servers.json b/tests/src/providers/wcs-servers.json
@@ -92,7 +92,9 @@
   }, {
     url: 'http://motherlode.ucar.edu:8080/thredds/wcs/fmrc/NCEP/DGEX/Alaska_12km/NCEP-DGEX-Alaska_12km_best.ncd'
   }, {
-    url: 'http://navigator.state.or.us/ArcGIS/services/Framework/Imagery_Mosaic2009/ImageServer/WCSServer'
+    url: 'http://navigator.state.or.us/ArcGIS/services/Framework/Imagery_Mosaic2009/ImageServer/WCSServer',
+    description: "GetCapabilities gives wrong URL for all requests (server does not exists). Additional parameter IgnoreGetMapUrl must be used",
+    params: { 'IgnoreGetMapUrl': '1' }
   }, {
     url: 'http://nsidc.org/cgi-bin/atlas_north'
 /*

diff --git a/tests/src/python/test_qgscomposition.py b/tests/src/python/test_qgscomposition.py
@@ -39,13 +39,13 @@
         print "You need to install unittest2 to run the salt tests"
         sys.exit(1)
 else:
-    from unittest import  expectedFailure
+    from unittest import TestCase, expectedFailure
 
 QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
 TEST_DATA_DIR = unitTestDataPath()
 
 
-class TestQgsComposition(unittest.TestCase):
+class TestQgsComposition(TestCase):
 
     def setUp(self):
         """Run before each test."""