diff --git a/CodenameOne/src/com/codename1/charts/util/ColorUtil.java b/CodenameOne/src/com/codename1/charts/util/ColorUtil.java
index b99fe49485..41a446bef6 100644
--- a/CodenameOne/src/com/codename1/charts/util/ColorUtil.java
+++ b/CodenameOne/src/com/codename1/charts/util/ColorUtil.java
@@ -27,15 +27,15 @@
  * @author shannah
  */
 public class ColorUtil {
-    public static int LTGRAY = IColor.LightGray.argb;
-    public static int BLUE = IColor.Blue.argb;
-    public static int BLACK = IColor.Black.argb;
-    public static int WHITE = IColor.White.argb;
-    public static int CYAN = IColor.Cyan.argb;
-    public static int GREEN = IColor.Green.argb;
-    public static int YELLOW = IColor.Yellow.argb;
-    public static int MAGENTA = IColor.Magenta.argb;
-    public static int GRAY = IColor.Gray.argb;
+    public static final int LTGRAY = IColor.LightGray.argb;
+    public static final int BLUE = IColor.Blue.argb;
+    public static final int BLACK = IColor.Black.argb;
+    public static final int WHITE = IColor.White.argb;
+    public static final int CYAN = IColor.Cyan.argb;
+    public static final int GREEN = IColor.Green.argb;
+    public static final int YELLOW = IColor.Yellow.argb;
+    public static final int MAGENTA = IColor.Magenta.argb;
+    public static final int GRAY = IColor.Gray.argb;
 
 
     public static int argb(int a, int r, int g, int b) {
diff --git a/CodenameOne/src/com/codename1/io/Cookie.java b/CodenameOne/src/com/codename1/io/Cookie.java
index 93876c6fbd..57a2608b9c 100644
--- a/CodenameOne/src/com/codename1/io/Cookie.java
+++ b/CodenameOne/src/com/codename1/io/Cookie.java
@@ -34,7 +34,7 @@
  * @author Shai Almog
  */
 public class Cookie implements Externalizable {
-    public static String STORAGE_NAME = "Cookies";
+    public static final String STORAGE_NAME = "Cookies";
     private static boolean autoStored = true;
 
     static {
diff --git a/CodenameOne/src/com/codename1/io/Log.java b/CodenameOne/src/com/codename1/io/Log.java
index 2945449e8b..e56c46ddca 100644
--- a/CodenameOne/src/com/codename1/io/Log.java
+++ b/CodenameOne/src/com/codename1/io/Log.java
@@ -76,15 +76,15 @@ public class Log {
     /**
      * Indicates that log reporting to the cloud should be disabled
      */
-    public static int REPORTING_NONE = 0;
+    public static final int REPORTING_NONE = 0;
     /**
      * Indicates that log reporting to the cloud should occur regardless of whether an error occurred
      */
-    public static int REPORTING_DEBUG = 1;
+    public static final int REPORTING_DEBUG = 1;
     /**
      * Indicates that log reporting to the cloud should occur only if an error occurred
      */
-    public static int REPORTING_PRODUCTION = 3;
+    public static final int REPORTING_PRODUCTION = 3;
     private static boolean crashBound;
     private static Log instance = new Log();
     private static boolean initialized;
diff --git a/CodenameOne/src/com/codename1/javascript/JavascriptContext.java b/CodenameOne/src/com/codename1/javascript/JavascriptContext.java
index a474108527..eca93b55a5 100644
--- a/CodenameOne/src/com/codename1/javascript/JavascriptContext.java
+++ b/CodenameOne/src/com/codename1/javascript/JavascriptContext.java
@@ -86,7 +86,7 @@ public class JavascriptContext {
     /**
      * Flag to enable/disable logging to a debug log.
      */
-    public static boolean DEBUG = false;
+    public static final boolean DEBUG = false;
     /**
      * Running counter to mark the context ID.  Each javascript context has its
      * own lookup table, and this running counter allows us to generate a unique
diff --git a/CodenameOne/src/com/codename1/location/LocationRequest.java b/CodenameOne/src/com/codename1/location/LocationRequest.java
index 7db0aa7bfe..11546bd536 100644
--- a/CodenameOne/src/com/codename1/location/LocationRequest.java
+++ b/CodenameOne/src/com/codename1/location/LocationRequest.java
@@ -33,17 +33,17 @@ public class LocationRequest {
     /**
      * When you need gps location updates
      */
-    public static int PRIORITY_HIGH_ACCUARCY = 0;
+    public static final int PRIORITY_HIGH_ACCUARCY = 0;
 
     /**
      * When accuracy is not highly important and you want to save battery
      */
-    public static int PRIORITY_MEDIUM_ACCUARCY = 1;
+    public static final int PRIORITY_MEDIUM_ACCUARCY = 1;
 
     /**
      * When accuracy is not important and you want to save battery
      */
-    public static int PRIORITY_LOW_ACCUARCY = 2;
+    public static final int PRIORITY_LOW_ACCUARCY = 2;
 
     private int priority = PRIORITY_MEDIUM_ACCUARCY;
 
diff --git a/CodenameOne/src/com/codename1/ui/html/DocumentInfo.java b/CodenameOne/src/com/codename1/ui/html/DocumentInfo.java
index 57eb86c28a..cab5ffdabe 100644
--- a/CodenameOne/src/com/codename1/ui/html/DocumentInfo.java
+++ b/CodenameOne/src/com/codename1/ui/html/DocumentInfo.java
@@ -45,17 +45,17 @@ public class DocumentInfo {
     /**
      * Indicates that the request is for a page
      */
-    public static int TYPE_HTML = 0;
+    public static final int TYPE_HTML = 0;
 
     /**
      * Indicates that the request is for an image
      */
-    public static int TYPE_IMAGE = 1;
+    public static final int TYPE_IMAGE = 1;
 
     /**
      * Indicates that the request is for a CSS file
      */
-    public static int TYPE_CSS = 2;
+    public static final int TYPE_CSS = 2;
 
     private static String DEFAULT_ENCODING = ENCODING_ISO;
 
diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/PlatformDefaults.java b/CodenameOne/src/com/codename1/ui/layouts/mig/PlatformDefaults.java
index b06673a72a..8163677acf 100644
--- a/CodenameOne/src/com/codename1/ui/layouts/mig/PlatformDefaults.java
+++ b/CodenameOne/src/com/codename1/ui/layouts/mig/PlatformDefaults.java
@@ -118,7 +118,7 @@ public final class PlatformDefaults {
      * to specify the visual padding.
      * <p>
      */
-    public static String VISUAL_PADDING_PROPERTY = "visualPadding";
+    public static final String VISUAL_PADDING_PROPERTY = "visualPadding";
     static BoundSize RELATED_X = null, RELATED_Y = null, UNRELATED_X = null, UNRELATED_Y = null;
     private static int DEF_H_UNIT = UnitValue.LPX;
     private static int DEF_V_UNIT = UnitValue.LPY;