diff --git a/src/riak_core_capability.erl b/src/riak_core_capability.erl
index 139d2beb4..b503e84ae 100644
--- a/src/riak_core_capability.erl
+++ b/src/riak_core_capability.erl
@@ -133,6 +133,7 @@ register(Capability, Supported, Default, LegacyVar) ->
 register(Capability, Supported, Default) ->
     register(Capability, Supported, Default, undefined).
 
+            
 %% @doc Query the current negotiated mode for a given capability, throwing an
 %%      exception if the capability is unknown or the capability system is
 %%      unavailable.
diff --git a/src/riak_core_tracer.erl b/src/riak_core_tracer.erl
index 4e06f6ec8..9c88d1e85 100644
--- a/src/riak_core_tracer.erl
+++ b/src/riak_core_tracer.erl
@@ -107,7 +107,7 @@ handle_call({filter, MFs, Filter}, _From, State) ->
 handle_call({collect, Duration, Nodes}, _From, State) ->
     cancel_timer(State#state.stop_tref),
     Tref = timer:send_after(Duration, collect_timeout),
-    dbg:stop_clear(),
+    dbg:stop(),
     dbg:tracer(process, {fun ({trace, _, call, {?MODULE, trigger_sentinel, _}}, Pid) ->
                                  gen_server:cast(Pid, stop_sentinel),
                                  Pid;
@@ -161,7 +161,7 @@ handle_call(stop, _From, State) ->
     {stop, normal, ok, State}.
 
 handle_cast(stop_sentinel, State) ->
-    dbg:stop_clear(),
+    dbg:stop(),
     case State#state.stop_from of
         undefined ->
             ok;