diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 713a88d81b49b38c7c9687a67c22dace7580cc36..f432c5eb815537df1afe4b88e95032b2b7f953f7 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -74,13 +74,8 @@ build: $(GNUR_HOME)/bin/R
 $(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf 
 	(cd $(GNUR_HOME); make >& gnur_make.log)
 
-HAVE_MAKEFILE := $(shell [ -f $(GNUR_HOME)/Makefile ] && echo "Makefile.exists")
 clean: cleangnur
 	rm -f Makeconf.done
 
-ifeq ($(HAVE_MAKEFILE),Makefile.exists)
 cleangnur:
-	(cd $(GNUR_HOME); make distclean)
-else
-cleangnur:
-endif
+	rm -rf R-$(R_VERSION)
diff --git a/com.oracle.truffle.r.native/library/stats/Makefile b/com.oracle.truffle.r.native/library/stats/Makefile
index c2f5b3642ec20e7fa90b9c3a593241487da3524b..38f19a391218803c60f9baf899821ebacfc47e89 100644
--- a/com.oracle.truffle.r.native/library/stats/Makefile
+++ b/com.oracle.truffle.r.native/library/stats/Makefile
@@ -40,6 +40,8 @@ C_SOURCES := $(C_SOURCES) $(SRC)/fft.c
 C_OBJECTS := $(C_OBJECTS) $(OBJ)/fft.o
 endif
 
+$(C_OBJECTS): | $(OBJ)
+
 $(SRC)/fft.c: $(GNUR_FFT) src/ed_fft
 	ed $(GNUR_FFT) < src/ed_fft
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleBuiltins.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleBuiltins.java
index dc283a7a436f18130265c7ea7ad1627c872a76ee..f49d404c594764932f6475b805698d232279894d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleBuiltins.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleBuiltins.java
@@ -1677,7 +1677,7 @@ public class TestSimpleBuiltins extends TestBase {
         assertEval("{ gsub(\"a\",\"aa\", \"prague alley\", fixed=TRUE) }");
         assertEval("{ sub(\"a\",\"aa\", \"prague alley\", fixed=TRUE) }");
         assertEval("{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE) }");
-        assertEval("{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE, ignore.case=TRUE) }");
+        assertEval(Output.ContainsWarning, "{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE, ignore.case=TRUE) }");
         assertEval("{ gsub(\"([a-e])\",\"\\\\1\\\\1\", \"prague alley\") }");
         assertEval("{ gsub(\"h\",\"\", c(\"hello\", \"hi\", \"bye\")) }");
         assertEval("{ gsub(\"h\",\"\", c(\"hello\", \"hi\", \"bye\"), fixed=TRUE) }");