diff --git a/Makefile b/Makefile
index d56f0081..2cf08816 100644
--- a/Makefile
+++ b/Makefile
@@ -143,11 +143,11 @@ CCOPTS_SHARED = -pedantic -ansi -std=c99 -Wall -fstrict-aliasing
 CCOPTS_SHARED += -I./dist/src
 #CCOPTS_SHARED += -I./dist/src-separate
 #CCOPTS_SHARED += -m32                             # force 32-bit compilation on a 64-bit host
-CCOPTS_SHARED += -I/usr/include/ncurses            # for cmdline tool
 CCOPTS_NONDEBUG = $(CCOPTS_SHARED) -Os -fomit-frame-pointer
 CCOPTS_DEBUG = $(CCOPTS_SHARED) -O0 -g -ggdb
 CCLIBS	= -lm
-CCLIBS += -lreadline -lncurses                     # for cmdline tool
+CCLIBS += -lreadline
+CCLIBS += -lncurses  # on some systems -lreadline also requires -lncurses (e.g. RHEL)
 .PHONY: default all clean test install
 
 default:	all64
@@ -203,7 +203,7 @@ qtest:	npminst duk.400
 	node runtests/runtests.js --run-duk --cmd-duk=$(shell pwd)/duk.400 --num-threads 16 --log-file=/tmp/duk-test.log ecmascript-testcases/
 
 vgtest:	npminst duk.400
-	node runtests/runtests.js --run-duk --cmd-duk=$(shell pwd)/duk.400 --num-threads 1 --log-file=/tmp/duk-vgtest.log --valgrind --verbose ecmascript-testcases/
+	node runtests/runtests.js --run-duk --cmd-duk=$(shell pwd)/duk.400 --num-threads 1 --test-sleep 30  --log-file=/tmp/duk-vgtest.log --valgrind --verbose ecmascript-testcases/
 
 apitest:	npminst libduktape400.so.1.0.0
 	node runtests/runtests.js --num-threads 1 --log-file=/tmp/duk-api-test.log api-testcases/
diff --git a/examples/Makefile.cmdline b/examples/Makefile.cmdline
index 0ed1bf7f..6298aa3a 100644
--- a/examples/Makefile.cmdline
+++ b/examples/Makefile.cmdline
@@ -16,6 +16,10 @@ CCLIBS	= -lm
 # For the command line tool
 CCLIBS += -lreadline
 
+# On some platforms -lreadline also requires -lncurses (e.g. RHEL), so it is
+# added by default (you may be able to remove it)
+CCLIBS += -lncurses
+
 # If you don't have readline, or something else fails to compile
 #CCOPTS += -DDUK_CMDLINE_BAREBONES
 
diff --git a/examples/Makefile.example b/examples/Makefile.example
index 72fffbf3..eb8b3a51 100644
--- a/examples/Makefile.example
+++ b/examples/Makefile.example
@@ -17,10 +17,11 @@ CC	= gcc
 CCOPTS	= -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer
 CCOPTS += -I./src  # for combined sources
 CCLIBS	= -lm
+DEFINES =
 
 # These should not be needed but you might consider them
 #CCOPTS += -m32                              # force 32-bit compilation on a 64-bit host
-#DEFINES = -DDUK_PROFILE=100                 # if omitted, profile defaults to 100 on a
+#DEFINES += -DDUK_PROFILE=100                # if omitted, profile defaults to 100 on a
 #                                            # 32-bit platform, and 400 otherwise
 
 # For debugging, use -O0 -g -ggdb, and don't add -fomit-frame-pointer