diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
index 7f4343034977c31af5db6782179680499ce2a929..ef6a876f10150a83939e57140cd3f8ff2e60ae45 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
@@ -113,6 +113,8 @@ public class REmbedded {
         runRmainloop(vm);
     }
 
+    // Checkstyle: stop method name check
+
     /**
      * Upcalled from embedded mode to commit suicide.
      */
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
index 54aa2160fa59c59c33dd0d1fe28a5b2ad198370c..5b4d80c96f3f3d8b085cf7f2a706ebb056a7eba9 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java
@@ -206,7 +206,7 @@ public abstract class ObjectSize extends RExternalBuiltinNode.Arg1 {
         return size;
     }
 
-    protected static abstract class RecursiveObjectSize extends TruffleBoundaryNode {
+    protected abstract static class RecursiveObjectSize extends TruffleBoundaryNode {
 
         protected abstract int executeInt(Object o);
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
index 921d6836dc307039a9cc25e375475477d42b4416..4727c2cba093be8d04f683e06f42b17eec0eed15 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/run/Rclasspath.sh b/com.oracle.truffle.r.native/run/Rclasspath.sh
index 01ca8dd60d6b483752a7d116f85fa5ca23261301..1c01496f42293d7b4186d99f79098d840c69ff16 100644
--- a/com.oracle.truffle.r.native/run/Rclasspath.sh
+++ b/com.oracle.truffle.r.native/run/Rclasspath.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/run/Rscript.sh b/com.oracle.truffle.r.native/run/Rscript.sh
index 527369554d9f6dc980e07cdfc233138766c6627e..863b98abf20ca80373e3c3526df94c508ce74a34 100755
--- a/com.oracle.truffle.r.native/run/Rscript.sh
+++ b/com.oracle.truffle.r.native/run/Rscript.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
index eb85de68ba76914709943e39c78c62f2067c8236..de33418f4c6c31fd5e0d0a6c671d783a7b3ebb6c 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
@@ -1264,6 +1264,8 @@ public class CallRFFIHelper {
         return RRNG.unifRand();
     }
 
+    // Checkstyle: stop method name check
+
     public static Object R_getGlobalFunctionContext() {
         if (RFFIUtils.traceEnabled()) {
             RFFIUtils.traceUpCall("getGlobalFunctionContext");
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
index 1721878f20ebf71441f1f717bd67227b34bb67c7..911a09d8291a12e6d029ee2120a74c3b58f83c0a 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RErrorHandling.java
@@ -163,7 +163,7 @@ public class RErrorHandling {
         }
     }
 
-    public static class HandlerStacks {
+    public static final class HandlerStacks {
         public final Object handlerStack;
         public final Object restartStack;
 
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
index 750ce81392afb69f927edbc11acb001d6ebfe3a6..012d2a4f2af7b6b943c90c753acf7df1eea8d362 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ROptions.java
@@ -132,7 +132,7 @@ public class ROptions {
     }
 
     /**
-     * S compatibility - pair list of the options
+     * S compatibility - pair list of the options.
      */
     private static final String DOT_OPTIONS = ".Options";
 
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
index 1770a5527f845a83d3dfac4b5adafac7ed994900..282508c41e25388db9d033b7eaea8dca6dd15c82 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RStartParams.java
@@ -44,7 +44,7 @@ public class RStartParams {
 
         private String userName;
 
-        private SA_TYPE(String userName) {
+        SA_TYPE(String userName) {
             this.userName = userName;
         }
 
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
index c4f62ef28599eb474af52e0aa93b7d87237a71f2..28b50af8c8b3d5842794fb01c39740f181fac876 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
@@ -110,7 +110,7 @@ public class DLL {
 
     }
 
-    public static class DLLInfo {
+    public static final class DLLInfo {
         private static final RStringVector NAMES = RDataFactory.createStringVector(new String[]{"name", "path", "dynamicLookup", "handle", "info"}, RDataFactory.COMPLETE_VECTOR);
         public static final String DLL_INFO_REFERENCE = "DLLInfoReference";
         private static final RStringVector INFO_REFERENCE_CLASS = RDataFactory.createStringVectorFromScalar(DLL_INFO_REFERENCE);
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index b6046306044561c167546b6343e3a22bb901eef4..573f4ba7708d8c65544061cb755aada2ce29520a 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -56,6 +56,7 @@ com.oracle.truffle.r.native/fficall/src/common/arithmetic_fastr.c,gnu_r_gentlema
 com.oracle.truffle.r.native/fficall/src/common/coerce_fastr.c,gnu_r_gentleman_ihaka.copyright
 com.oracle.truffle.r.native/fficall/src/common/errors_fastr.c,gnu_r.core.copyright
 com.oracle.truffle.r.native/fficall/src/common/inlined_fastr.c,gnu_r_gentleman_ihaka.copyright
+com.oracle.truffle.r.native/fficall/src/common/localecharset_fastr.c,gnu_r.copyright
 com.oracle.truffle.r.native/fficall/src/common/print_fastr.c,gnu_r_gentleman_ihaka.copyright
 com.oracle.truffle.r.native/fficall/src/common/printutils_fastr.c,gnu_r_gentleman_ihaka.copyright
 com.oracle.truffle.r.native/fficall/src/common/sys_fastr.c,gnu_r.copyright
@@ -106,6 +107,7 @@ com.oracle.truffle.r.native/library/tools/src/gramRd.c,no.copyright
 com.oracle.truffle.r.native/library/tools/src/tools_dummy.c,no.copyright
 com.oracle.truffle.r.native/library/utils/src/utils_dummy.c,no.copyright
 com.oracle.truffle.r.native/run/R.sh,oracle_bash.copyright
+com.oracle.truffle.r.native/run/Rclasspath.sh,oracle_bash.copyright
 com.oracle.truffle.r.native/run/Rscript_exec.sh,oracle_bash.copyright
 com.oracle.truffle.r.native/run/Rscript.sh,oracle_bash.copyright
 com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastrDqrls.java,gnu_r.copyright