4 files changed, 7 insertions, 20 deletions
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src
index 65fcf4aae5..579d2c0d1b 100644
--- a/lib/reltool/src/reltool.app.src
+++ b/lib/reltool/src/reltool.app.src
@@ -36,5 +36,5 @@
   {applications, [stdlib, kernel]},
   {env, []},
   {runtime_dependencies, ["wx-1.2","tools-2.6.14","stdlib-2.0","sasl-2.4",
-			  "kernel-3.0","erts-6.0"]}
+			  "kernel-3.0","erts-7.0"]}
  ]}.
diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl
index 66bc2b5ab3..d9e6f6d427 100644
--- a/lib/reltool/src/reltool_fgraph_win.erl
+++ b/lib/reltool/src/reltool_fgraph_win.erl
@@ -252,10 +252,10 @@ ticker_init(Pid) ->
 ticker_loop(Pid, Time) ->
     receive after Time ->
         Pid ! {self(), redraw},
-        T0 = now(),
+        T0 = erlang:monotonic_time(),
         receive {Pid, ok} -> ok end,
-        T1 = now(),
-        D = timer:now_diff(T1, T0)/1000,
+        T1 = erlang:monotonic_time(),
+        D = erlang:convert_time_unit(T1-T0, native, milli_seconds),
         case round(40 - D) of
             Ms when Ms < 0 ->
                 %io:format("ticker: wait is   0 ms [fg ~7s ms] [fps ~7s]~n",
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 5a3f34506d..e6b1901316 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -54,12 +54,7 @@ root_dir() ->
     code:root_dir().
 
 erl_libs() ->
-    case os:getenv("ERL_LIBS") of
-	false ->
-	    [];
-	LibStr ->
-	    string:tokens(LibStr, ":;")
-    end.
+    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
 
 lib_dirs(Dir) ->
     case erl_prim_loader:list_dir(Dir) of
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 347e80ed7c..f140d6c55f 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -1205,14 +1205,9 @@ create_slim(Config) ->
 
     RootDir = code:root_dir(),
     Erl = filename:join([RootDir, "bin", "erl"]),
-    EscapedQuote =
-	case os:type() of
-	    {win32,_} -> "\\\"";
-	    _         -> "\""
-	end,
     Args = ["-boot_var", "RELTOOL_EXT_LIB", TargetLibDir,
 	    "-boot", filename:join(TargetRelVsnDir,RelName),
-	    "-sasl", "releases_dir", EscapedQuote++TargetRelDir++EscapedQuote],
+	    "-sasl", "releases_dir", "\""++TargetRelDir++"\""],
     {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl, Args)),
     ?msym(RootDir, rpc:call(Node, code, root_dir, [])),
     wait_for_app(Node,sasl,50),
@@ -2518,10 +2513,7 @@ undefined_regexp(_Config) ->
 %% Library functions
 
 erl_libs() ->
-    case os:getenv("ERL_LIBS") of
-        false  -> [];
-        LibStr -> string:tokens(LibStr, ":;")
-    end.
+    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
 
 datadir(Config) ->
     %% Removes the trailing slash...