diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
index a182c4bf49f21d0fbc21017fc50dde1c77c16816..cf00af05aac70b7a0bb357af3d8dd564c42f8e3b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
@@ -212,7 +212,7 @@ public class FastRInterop {
 
             File file = new File(path);
             try {
-                Builder<IOException, RuntimeException, RuntimeException> sourceBuilder = Source.newBuilder(file).name(file.getName()).internal();
+                Builder<IOException, RuntimeException, RuntimeException> sourceBuilder = Source.newBuilder(file).name(file.getName());
                 if (languageId != null) {
                     sourceBuilder.language(languageId);
                 }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignDoubleWrapper.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignDoubleWrapper.java
index 53bb9223123738459501f2511f9980d4fe45d723..6d54a0f742a9b5abff880e20d0d5326f8940d13a 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignDoubleWrapper.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignDoubleWrapper.java
@@ -73,7 +73,7 @@ public final class RForeignDoubleWrapper extends RForeignWrapper implements RAbs
     private static double checkIsNull(Object value, ClassCastException e) throws RuntimeException {
         if (value instanceof TruffleObject) {
             if (ForeignAccess.sendIsNull(IS_NULL, (TruffleObject) value)) {
-                return RRuntime.INT_NA;
+                return RRuntime.DOUBLE_NA;
             }
         }
         throw RInternalError.shouldNotReachHere(e);
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index b6eaccf56c1109b3810b7015e7bd27b056114cfd..4f9e0dee9a33b5c9048a5e41b9967d1df70c6702 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -72277,6 +72277,25 @@ Error: unexpected '}' in "{ .Internal(strrep(, '') }"
 [1] ""
 
 
+##com.oracle.truffle.r.test.builtins.TestBuiltin_strsplit.testStrSplit#
+#strsplit('a[1][1]=x11&a[1][2]=x12', '[[]')
+[[1]]
+[1] "a"        "1]"       "1]=x11&a" "1]"       "2]=x12"
+
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_strsplit.testStrSplit#
+#strsplit('a[1][1]=x11&a[1][2]=x12', '[][]')
+[[1]]
+[1] "a"      "1"      ""       "1"      "=x11&a" "1"      ""       "2"
+[9] "=x12"
+
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_strsplit.testStrSplit#
+#strsplit('a[1][1]=x11&a[1][2]=x12', ']')
+[[1]]
+[1] "a[1"      "[1"       "=x11&a[1" "[2"       "=x12"
+
+
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_strsplit.testStrSplit#
 #strsplit('foo bar baz', '[f z]', perl=TRUE)
 [[1]]
@@ -85461,6 +85480,12 @@ In readLines(zz, 2, warn = T, skipNul = F) :
 Warning message:
 In open.connection(con, "rb") : connection is already open
 
+##com.oracle.truffle.r.test.library.base.TestConnections.testSeek#
+#f1 <- file(open='w+b', encoding='UTF-8'); writeBin(charToRaw("abcd"), f1); seek(f1); seek(f1,0); seek(f1)
+[1] 4
+[1] 4
+[1] 0
+
 ##com.oracle.truffle.r.test.library.base.TestConnections.testSeekTextConnection#
 #{ zz <- textConnection("Hello, World!"); res <- isSeekable(zz); close(zz); res }
 [1] FALSE