diff --git a/python/plugins/sextante/core/SextanteVectorWriter.py b/python/plugins/sextante/core/SextanteVectorWriter.py
@@ -57,6 +57,7 @@ def __init__(self, fileName, encoding, fields, geometryType, crs, options=None):
                 uri += "?crs=" + crs.authid()
             self.memLayer = QgsVectorLayer(uri, self.fileName, "memory")
             self.writer = self.memLayer.dataProvider()
+            # FIXME: addAttributes was deprecated and removed
             self.writer.addAttributes(fields.values())
             self.memLayer.updateFieldMap()
         else:

diff --git a/python/plugins/sextante/gdal/warp.py b/python/plugins/sextante/gdal/warp.py
@@ -50,8 +50,8 @@ def defineCharacteristics(self):
         self.name = "Warp (reproject)"
         self.group = "[GDAL] Projections"
         self.addParameter(ParameterRaster(warp.INPUT, "Input layer", False))
-        self.addParameter(ParameterCrs(warp.SOURCE_SRS, "Source SRS (EPSG Code)", "4326"))
-        self.addParameter(ParameterCrs(warp.DEST_SRS, "Destination SRS (EPSG Code)", "4326"))
+        self.addParameter(ParameterCrs(warp.SOURCE_SRS, "Source SRS (EPSG Code)", "EPSG:4326"))
+        self.addParameter(ParameterCrs(warp.DEST_SRS, "Destination SRS (EPSG Code)", "EPSG:4326"))
         self.addParameter(ParameterSelection(warp.METHOD, "Resampling method", warp.METHOD_OPTIONS))
         self.addOutput(OutputRaster(warp.OUTPUT, "Output layer"))
 
@@ -60,9 +60,9 @@ def processAlgorithm(self, progress):
         self.crs = QgsCoordinateReferenceSystem(int(srs))
         commands = ["gdalwarp"]
         commands.append("-s_srs")
-        commands.append("EPSG:" + str(self.getParameterValue(warp.SOURCE_SRS)))
+        commands.append(str(self.getParameterValue(warp.SOURCE_SRS)))
         commands.append("-t_srs")
-        commands.append("EPSG:" + str(srs))
+        commands.append(str(srs))
         commands.append("-r")
         commands.append(warp.METHOD_OPTIONS[self.getParameterValue(warp.METHOD)])
         commands.append("-of")

diff --git a/python/plugins/sextante/gui/CrsSelectionDialog.py b/python/plugins/sextante/gui/CrsSelectionDialog.py
@@ -32,7 +32,7 @@ class CrsSelectionDialog(QDialog):
 
     def __init__(self):
         QDialog.__init__(self)
-        self.epsg = None
+        self.authid = None
         layout = QVBoxLayout()
         self.selector = QgsProjectionSelector(self)
         buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Close)
@@ -44,9 +44,9 @@ def __init__(self):
         self.connect(buttonBox, SIGNAL("rejected()"), self.cancelPressed)
 
     def okPressed(self):
-        self.epsg = self.selector.selectedEpsg()
+        self.authid = self.selector.selectedAuthId()
         self.close()
 
     def cancelPressed(self):
-        self.epsg = None
-        self.close()
+        self.authid = None
+        self.close()
diff --git a/python/plugins/sextante/gui/CrsSelectionPanel.py b/python/plugins/sextante/gui/CrsSelectionPanel.py
@@ -30,7 +30,7 @@ class CrsSelectionPanel(QtGui.QWidget):
 
     def __init__(self, default):
         super(CrsSelectionPanel, self).__init__(None)
-        self.epsg = default
+        self.authid = default
         self.horizontalLayout = QtGui.QHBoxLayout(self)
         self.horizontalLayout.setSpacing(2)
         self.horizontalLayout.setMargin(0)
@@ -48,12 +48,12 @@ def __init__(self, default):
     def showSelectionDialog(self):
         dialog = CrsSelectionDialog()
         dialog.exec_()
-        if dialog.epsg:
-            self.epsg = str(dialog.epsg)
+        if dialog.authid:
+            self.authid = str(dialog.authid)
             self.setText()
 
     def setText(self):
-        self.text.setText("EPSG:" + str(self.epsg))
+        self.text.setText(str(self.authid))
 
     def getValue(self):
-        return self.epsg
+        return self.authid
diff --git a/python/plugins/sextante/parameters/ParameterCrs.py b/python/plugins/sextante/parameters/ParameterCrs.py
@@ -27,8 +27,8 @@
 
 class ParameterCrs(Parameter):
 
-    def __init__(self, name="", description="", default = "4326"):
-        '''The value is the EPSG code of the CRS'''
+    def __init__(self, name="", description="", default = "EPSG:4326"):
+        '''The value is the auth id of the CRS'''
         Parameter.__init__(self, name, description)
         self.value = None
         self.default = default

diff --git a/python/plugins/sextante/tests/qgis_interface.py b/python/plugins/sextante/tests/qgis_interface.py
@@ -41,8 +41,7 @@ def __init__(self, canvas):
         self.canvas = canvas
         self.testRaster = QgsRasterLayer('data/raster', "raster")
         self.testVector = QgsVectorLayer('data/vector', "vector", 'ogr')
-        QgsMapLayerRegistry.instance().addMapLayer(self.testRaster)
-        QgsMapLayerRegistry.instance().addMapLayer(self.testVector)
+        QgsMapLayerRegistry.instance().addMapLayers([self.testRaster,self.testVector])
 
         self.statusBar = type('FakeStatusBar', (),
         {'showMessage' : lambda _, m: None

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -590,6 +590,7 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${GEOS_LIBRARY}
   ${GDAL_LIBRARY}
   ${SPATIALINDEX_LIBRARY}
+  ${EXPAT_LIBRARY}
 )
 
 IF (WITH_INTERNAL_SPATIALITE)

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -15,6 +15,7 @@ ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(roadgraph)
 ADD_SUBDIRECTORY(zonal_statistics)
 ADD_SUBDIRECTORY(georeferencer)
+ADD_SUBDIRECTORY(gps_importer)
 
 IF (WITH_SPATIALITE)
   ADD_SUBDIRECTORY(offline_editing)
@@ -28,10 +29,6 @@ IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)
 
-IF (EXPAT_FOUND)
-ADD_SUBDIRECTORY(gps_importer)
-ENDIF (EXPAT_FOUND)
-
 IF (WITH_GLOBE)
   ADD_SUBDIRECTORY(globe)
 ENDIF (WITH_GLOBE)

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -12,6 +12,8 @@ ADD_SUBDIRECTORY(gdal)
 ADD_SUBDIRECTORY(mssql)
 ADD_SUBDIRECTORY(ows)
 ADD_SUBDIRECTORY(wcs)
+ADD_SUBDIRECTORY(gpx)
+ADD_SUBDIRECTORY(wfs)
 
 IF (POSTGRES_FOUND)
   ADD_SUBDIRECTORY(postgres)
@@ -21,11 +23,6 @@ IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
   ADD_SUBDIRECTORY(spatialite)
 ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
 
-IF (EXPAT_FOUND)
-  ADD_SUBDIRECTORY(gpx)
-  ADD_SUBDIRECTORY(wfs)
-ENDIF (EXPAT_FOUND)
-
 IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)