diff --git a/src/ejabberd_debug.erl b/src/ejabberd_debug.erl
index f2152d851..84581eb38 100644
--- a/src/ejabberd_debug.erl
+++ b/src/ejabberd_debug.erl
@@ -46,7 +46,7 @@ pids() ->
     lists:zf(
       fun(Pid) ->
 	      case process_info(Pid) of
-		  ProcessInfo when list(ProcessInfo) ->
+		  ProcessInfo when is_list(ProcessInfo) ->
 		      CurrentFunction = current_function(ProcessInfo),
 		      InitialCall = initial_call(ProcessInfo),
 		      RegisteredName = registered_name(ProcessInfo),
diff --git a/src/eldap/eldap.erl b/src/eldap/eldap.erl
index 3c3e736ae..f77ea8296 100644
--- a/src/eldap/eldap.erl
+++ b/src/eldap/eldap.erl
@@ -699,7 +699,7 @@ recvd_packet(Pkt, S) ->
 	    Answer = 
 	    case {Name, Op} of
 		{searchRequest, {searchResEntry, R}} when
-		record(R,'SearchResultEntry') ->
+		is_record(R,'SearchResultEntry') ->
 		    New_dict = dict:append(Id, R, Dict),
 		    {ok, S#eldap{dict = New_dict}};
 		{searchRequest, {searchResDone, Result}} ->
@@ -1059,7 +1059,7 @@ get_list(Key, List) ->
 
 get_atom(Key, List) ->
     case lists:keysearch(Key, 1, List) of
-	{value, {Key, Value}} when atom(Value) ->
+	{value, {Key, Value}} when is_atom(Value) ->
 	    Value;
 	{value, {Key, _Value}} ->
 	    throw({error, "Bad Value in Config for " ++ atom_to_list(Key)});