diff --git a/Documentation/My_Skate_Map_stralciata.kml b/Documentation/My_Skate_Map_stralciata.kml
index 5e748e2..009ef74 100644
--- a/Documentation/My_Skate_Map_stralciata.kml
+++ b/Documentation/My_Skate_Map_stralciata.kml
@@ -23,11 +23,6 @@ Arona
 http://photos-c.ak.fbcdn.net/photos-ak-snc1/v2354/208/59/1014471167/n1014471167_30316786_3112.jpg
 8.550451,45.74826
 
-Ascona
-http://lh4.ggpht.com/_1mMyAZAEcFQ/RhvvGPKQXCI/AAAAAAAAAMs/0uQbj4jwzbg/s144/016_0001.jpg
-<![CDATA[Da ale (http://picasaweb.google.com/STLuina/Ale?feat=embedwebsite)]]>
-8.771671,46.16199
-
 Bern
 7.407392,46.948548
 
@@ -133,9 +128,6 @@ Sportstrasse 97
 Portland - Burnside
 -122.66343200000001,45.523066
 
-Riazzino - Vanja
-8.893175,46.1757
-
 Riva del Garda
 http://www.skatemap.it/images/spots/tn/tn_135_621378769.jpg
 10.879211,45.86515
diff --git a/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.cpp b/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.cpp
index b2b2331..29b727d 100644
--- a/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.cpp
+++ b/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.cpp
@@ -28,6 +28,10 @@
 
 //-----------------------------------------------------------------------------------------------------------------------------
 
+const int LocationManager::_CONST::GPS::UPDATE_ITERVAL_MS (4000);
+
+//-----------------------------------------------------------------------------------------------------------------------------
+
 LocationManager::LocationManager(Settings *settings,
                                  PlateformDetail *plateformDetail,
                                  QObject *parent)
@@ -42,14 +46,14 @@ LocationManager::LocationManager(Settings *settings,
 
   if (m_GeoPositionInfoSource == NULL)
   {
-    Logger::warning(tr("Invalid GeoPositionInfoSource"));
+    Logger::warning(QString("LocationManager::%1() Invalid GeoPositionInfoSource").arg(__FUNCTION__));
 
     // Set position from last position
     setCurrentPosition(m_Settings->get_Location_LastCoordinate());
   }
   else
   {
-    m_GeoPositionInfoSource->setUpdateInterval(3000);
+    m_GeoPositionInfoSource->setUpdateInterval(_CONST::GPS::UPDATE_ITERVAL_MS);
 
     if(m_GeoPositionInfoSource->lastKnownPosition().isValid())
     {
diff --git a/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.h b/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.h
index 95414f9..35a9e45 100644
--- a/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.h
+++ b/MobileClient/QtProject/src/cpp/HelperClasses/LocationManager.h
@@ -29,6 +29,16 @@ class LocationManager : public QObject
 
 public:
 
+  class _CONST
+  {
+    public:
+      class GPS
+      {
+        public:
+          static const int UPDATE_ITERVAL_MS;
+      }; // GPS
+  }; // _CONST
+
   explicit LocationManager(Settings *settings,
                            PlateformDetail *plateformDetail,
                            QObject *parent = 0);
diff --git a/MobileClient/QtProject/src/qml/pages-upload/Upload_CropPicture.qml b/MobileClient/QtProject/src/qml/pages-upload/Upload_CropPicture.qml
index e290ae6..cc6cbf1 100644
--- a/MobileClient/QtProject/src/qml/pages-upload/Upload_CropPicture.qml
+++ b/MobileClient/QtProject/src/qml/pages-upload/Upload_CropPicture.qml
@@ -224,8 +224,7 @@ Item{
 
       onClicked: {
         // Set crop image
-        if(wa_PictureUploader.setCropPicture(source,
-                                             cropX,
+        if(wa_PictureUploader.setCropPicture(cropX,
                                              cropY,
                                              cropSide)
             === false)
@@ -244,11 +243,9 @@ Item{
     function navigator_ContinueButtonClicked()
     {
       // Set crop image
-      if(wa_PictureUploader.setCropPicture(source,
-                                           cropX,
+      if(wa_PictureUploader.setCropPicture(cropX,
                                            cropY,
-                                           cropSide,
-                                           image.rotation)
+                                           cropSide)
           === false)
       {
         messageDialog_Error.text = wa_PictureUploader.lastErrorText();