diff --git a/src/gproc.erl b/src/gproc.erl
index afa56fe..48f4d4d 100644
--- a/src/gproc.erl
+++ b/src/gproc.erl
@@ -818,9 +818,7 @@ nb_wait1(_) ->
     ?THROW_GPROC_ERROR(badarg).
 
 nb_wait1(Node, {n,l,_} = Key) when is_atom(Node) ->
-    call(Node, {await, Key, self()}, l);
-nb_wait1(_, _) ->
-    ?THROW_GPROC_ERROR(badarg).
+    call(Node, {await, Key, self()}, l).
 
 
 %% @spec cancel_wait(Key::key(), Ref) -> ok
diff --git a/src/gproc_dist.erl b/src/gproc_dist.erl
index 743f7c3..ea5850a 100644
--- a/src/gproc_dist.erl
+++ b/src/gproc_dist.erl
@@ -701,7 +701,7 @@ update_counter_g({c,g,_} = Key, {Incr, Threshold, SetValue}, Pid)
     [Prev, New] = ets:update_counter(?TAB, {Key, Pid},
 				     [{3, 0}, {3, Incr, Threshold, SetValue}]),
     update_aggr_counter(Key, New - Prev, [{{Key,Pid},Pid,New}]);
-update_counter_g({c,l,_} = Key, Ops, Pid) when is_list(Ops) ->
+update_counter_g({c,g,_} = Key, Ops, Pid) when is_list(Ops) ->
     case ets:update_counter(?TAB, {Key, Pid},
 			    [{3, 0} | expand_ops(Ops)]) of
 	[_] ->