diff --git a/include/client.h b/include/client.h
index 49f79d7..da61c85 100644
--- a/include/client.h
+++ b/include/client.h
@@ -283,7 +283,7 @@ struct LocalUser
 
 	struct PrivilegeSet *privset;		/* privset... */
 
-	struct rb_event_t *override_timeout_event;
+	struct ev_entry *override_timeout_event;
 };
 
 struct PreClient
diff --git a/modules/m_whois.c b/modules/m_whois.c
index bc8b36b..3fc8f12 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -317,7 +317,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
 	if(IsOper(target_p))
 	{
-		if(md = user_metadata_find(target_p, "OPERSTRING"))
+		if((md = user_metadata_find(target_p, "OPERSTRING")) != NULL)
 			sendto_one_numeric(source_p, 313, "%s :%s", target_p->name, md->value);
 		else
 			sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
@@ -325,7 +325,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 					IsService(target_p) ? ConfigFileEntry.servicestring :
 				  	(IsAdmin(target_p) ? GlobalSetOptions.adminstring :
 				  	GlobalSetOptions.operstring));
-		if(md = user_metadata_find(target_p, "SWHOIS"))
+		if((md = user_metadata_find(target_p, "SWHOIS")) != NULL)
 			sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
 	}