diff --git a/mobile/com.sap.sailing.android.shared/lint.xml b/mobile/com.sap.sailing.android.shared/lint.xml
index ee0eead5bb7..9c8f6c659a3 100755
--- a/mobile/com.sap.sailing.android.shared/lint.xml
+++ b/mobile/com.sap.sailing.android.shared/lint.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!-- Reason: Eclipse users don't get the override -->
+    <issue id="GradleOverrides">
+        <ignore path="AndroidManifest.xml" />
+    </issue>
+
 </lint>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/MapMarker.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/MapMarker.java
index 93792274e4c..5af907ac469 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/MapMarker.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/MapMarker.java
@@ -16,7 +16,7 @@ public interface MapMarker {
     public ArrayList<TrackMeasurement> getTrack();
     public UUID getID();
     public MarkType getType();
-    public Color getColor();
+    public Color getColor(Context context);
     public Marker getMarker();
     public void setMarker(Marker m);
     public BitmapDescriptor getMarkerIcon(Context context);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java
index 7df17f92379..c99a5e7448a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java
@@ -61,8 +61,8 @@ public class MapMarkerImpl implements MapMarker {
     }
 
     @Override
-    public Color getColor() {
-        String name = this.name.toLowerCase();
+    public Color getColor(Context context) {
+        String name = this.name.toLowerCase(context.getResources().getConfiguration().locale);
         if (name.startsWith("white")) {
             return Color.WHITE;
         } else if (name.startsWith("gray")) {
@@ -99,7 +99,7 @@ public class MapMarkerImpl implements MapMarker {
 
     @Override
     public BitmapDescriptor getMarkerIcon(Context context) {
-        String name = this.name.toLowerCase();
+        String name = this.name.toLowerCase(context.getResources().getConfiguration().locale);
         // buoys
         if (name.startsWith("white")) {
             return BitmapDescriptorFactory.fromResource(R.drawable.buoy_white_grey);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/WindFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/WindFragment.java
index 3c1c69b9216..202c219c6ac 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/WindFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/WindFragment.java
@@ -2,6 +2,7 @@ package com.sap.sailing.racecommittee.app.ui.fragments;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
+import android.annotation.TargetApi;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
@@ -298,6 +299,7 @@ public class WindFragment extends LoggableFragment
     /**
      * configures the WindMap-View, including the input field for the position of ones own boat
      */
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void setupMap() {
         AppPreferences preferences = AppPreferences.on(activity.getApplicationContext());
         // map location search input
@@ -347,7 +349,6 @@ public class WindFragment extends LoggableFragment
                         windMap.movePositionMarker(new LatLng(markerLat, savedInstanceState.getDouble("markerLng")));
                     }
                 }
-
             }
         }
     }
@@ -512,7 +513,8 @@ public class WindFragment extends LoggableFragment
      * @param animationDuration the duration of the fade
      */
     private void hideView(final View v, int animationDuration) {
-        v.animate().alpha(0f).setDuration(animationDuration)
+        v.animate().alpha(0f)
+                .setDuration(animationDuration)
                 .setListener(new AnimatorListener() {
                     @Override
                     public void onAnimationStart(Animator animation) {
@@ -593,7 +595,6 @@ public class WindFragment extends LoggableFragment
         currentLocation.setLongitude(marker.getPosition().longitude);
         AppPreferences preferences = AppPreferences.on(activity.getApplicationContext());
         preferences.setWindPosition(marker.getPosition());
-
     }
 
     @Override
@@ -602,8 +603,9 @@ public class WindFragment extends LoggableFragment
 
     @Override
     public void onMapClick(LatLng arg0) {
-        if (bigMap)
+        if (bigMap) {
             windMap.movePositionMarker(arg0);
+        }
     }
 
     @Override