diff --git a/.travis.yml b/.travis.yml
index 3c00cf5cf..56e51e797 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,3 @@ notification:
 otp_release:
   - 18.2.1
   - 18.1
-  - 17.5
-  - 17.4
diff --git a/master/eunit.config b/master/eunit.config
index badcd7138..eb64bf6f8 100644
--- a/master/eunit.config
+++ b/master/eunit.config
@@ -7,4 +7,4 @@
    {git, "https://github.com/discoproject/mochiweb.git", {branch,
                                                              "discoproject"}}},
  {triq, ".*",
-   {git, "https://github.com/krestenkrab/triq.git", "master"}}]}.
+   {git, "https://github.com/triqng/triq.git", "master"}}]}.
diff --git a/master/rebar.config b/master/rebar.config
index f13d7efae..d8ecf4d4b 100644
--- a/master/rebar.config
+++ b/master/rebar.config
@@ -5,8 +5,8 @@
   {platform_define, "^(18|19|2\d+|\d{3,})", time_correction}
 ]}.
 {deps,
-[{lager, "2.0.3",
-   {git, "https://github.com/basho/lager.git", {tag, "2.0.3"}}},
+[{lager, "3.2.2",
+   {git, "https://github.com/basho/lager.git"}},
   {folsomite, "",
       {git, "https://github.com/discoproject/folsomite", {branch, "master"}}},
   {plists, "",
diff --git a/master/src/ddfs/ddfs_rebalance.erl b/master/src/ddfs/ddfs_rebalance.erl
index a75f4d925..344f70532 100644
--- a/master/src/ddfs/ddfs_rebalance.erl
+++ b/master/src/ddfs/ddfs_rebalance.erl
@@ -103,7 +103,7 @@ weighted_select_items(L, K) ->
 weighted_select_items(_, 0, Items, _) ->
     Items;
 weighted_select_items(L, K, Items, Consumed) ->
-    P = random:uniform() * (1 - Consumed),
+    P = rand:uniform() * (1 - Consumed),
     {Item, Weight} = weighted_choose(L, P),
     Rest = lists:keydelete(Item, 1, L),
     weighted_select_items(Rest, K - 1, [Item|Items], Consumed + Weight).
diff --git a/master/src/disco_util.erl b/master/src/disco_util.erl
index a15b0129c..21e91e68d 100644
--- a/master/src/disco_util.erl
+++ b/master/src/disco_util.erl
@@ -31,7 +31,7 @@ groupby(N, [H|_] = List, Groups) ->
 
 -spec choose_random([T,...]) -> T.
 choose_random(L) ->
-    lists:nth(random:uniform(length(L)), L).
+    lists:nth(rand:uniform(length(L)), L).
 
 -spec choose_random(list(T), non_neg_integer()) -> list(T).
 choose_random(L, N) ->
diff --git a/master/src/job_coordinator.erl b/master/src/job_coordinator.erl
index fec47c46a..e9674de5c 100644
--- a/master/src/job_coordinator.erl
+++ b/master/src/job_coordinator.erl
@@ -433,7 +433,7 @@ retry_task(Host, _Error,
                           Sleep =
                               lists:min([FC * ?FAILED_MIN_PAUSE,
                                          ?FAILED_MAX_PAUSE])
-                              + random:uniform(?FAILED_PAUSE_RANDOMIZE),
+                              + rand:uniform(?FAILED_PAUSE_RANDOMIZE),
                           M = "Task ~s:~B failed on ~p, ~Bth failures so far."
                               " Sleeping ~B seconds before retrying.",
                           MArgs = [Stage, TaskId, Host, FC, round(Sleep / 1000)],