diff --git a/priv/riak_kv.schema b/priv/riak_kv.schema
index 37f155c68..b37ebfb2e 100644
--- a/priv/riak_kv.schema
+++ b/priv/riak_kv.schema
@@ -1209,7 +1209,7 @@
 
 %% @doc Set the vnode worker pool size
 %% This is a pool of workers per-vnode, to be used for general queries, in
-%% particular secondary index queries.  This now defaults to 4 workers, prior
+%% particular secondary index queries.  This now defaults to 5 workers, prior
 %% to release 3.0.9 it was set to a default of 10.
 %% The number of concurrent index queries that can be supported in the cluster
 %% will be equal to n_val * worker_count.
@@ -1219,15 +1219,15 @@
 %%  (1000000 div worker_vnode_pool_worktime) * n_val * worker_count
 %% It should normally be possible to support >> 100 queries per second with 
 %% just a single worker per vnode.
-%% The statistic workervnode_pool_queuetime_mean will track the average time
+%% The statistic worker_vnode_pool_queuetime_mean will track the average time
 %% a query is spending on a queue, should the vnode pool be exhausted.
 %% If using tictac_aae this should be set to at least 2, as tree rebuilds use
 %% this pool as well as queries.  Also consider that long-running legacy
-%% legacy queries (list keys and list buckets, not using aae_fold) also use
+%% queries (list keys and list buckets, not using aae_fold) also use
 %% this pool.  All aae_fold type queries will use the alternative
 %% node_worker_pool, unless none is used for the worker_pool_strategy, in which
 %% case the vnode pool is also used for aae_folds.
 {mapping, "worker_pool_size", "riak_kv.worker_pool_size", [
     {datatype, integer},
-    {default, 4}
-]}.
\ No newline at end of file
+    {default, 5}
+]}.
diff --git a/rebar.config b/rebar.config
index 577350a79..ea95d2f16 100644
--- a/rebar.config
+++ b/rebar.config
@@ -47,16 +47,16 @@
 ]}.
 
 {deps, [
-    {riak_core, {git, "https://github.com/basho/riak_core.git", {branch, "develop-3.0"}}},
+    {riak_core, {git, "https://github.com/basho/riak_core.git", {tag, "riak_kv-3.0.9"}}},
     {sidejob, {git, "https://github.com/basho/sidejob.git", {tag, "2.1.0"}}},
     {bitcask, {git, "https://github.com/basho/bitcask.git", {tag, "2.1.0"}}},
     {redbug, {git, "https://github.com/massemanet/redbug", {tag, "1.2.2"}}},
     {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.2"}}},
     {sext, {git, "https://github.com/uwiger/sext.git", {tag, "1.4.1"}}},
-    {riak_pipe, {git, "https://github.com/basho/riak_pipe.git", {branch, "develop-3.0"}}},
+    {riak_pipe, {git, "https://github.com/basho/riak_pipe.git", {tag, "riak_kv-3.0.9"}}},
     {riak_dt, {git, "https://github.com/basho/riak_dt.git", {tag, "riak_kv-3.0.0"}}},
-    {riak_api, {git, "https://github.com/basho/riak_api.git", {branch, "develop-3.0"}}},
+    {riak_api, {git, "https://github.com/basho/riak_api.git", {tag, "riak_kv-3.0.9"}}},
     {hyper, {git, "https://github.com/basho/hyper", {tag, "1.1.0"}}},
-    {kv_index_tictactree, {git, "https://github.com/martinsumner/kv_index_tictactree.git", {branch, "develop-3.0"}}},
+    {kv_index_tictactree, {git, "https://github.com/martinsumner/kv_index_tictactree.git", {tag, "1.0.1"}}},
     {riakhttpc, {git, "https://github.com/basho/riak-erlang-http-client", {tag, "3.0.8"}}}
        ]}.