diff --git a/src/core/auth.c b/src/core/auth.c
index 11400ba..6c83730 100644
--- a/src/core/auth.c
+++ b/src/core/auth.c
@@ -86,7 +86,8 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 		}
 
 		strncpy(info->nickname, data, MAX_NICK_LEN);
-		strncpy(info->password, data_extra, MAX_PASS_LEN);
+		if (data_extra)
+			strncpy(info->password, data_extra, MAX_PASS_LEN);
 		info->credentials = status;
 		list_append(list, info);
 		LOG_DEBUG("ACL: Added user '%s' (%s)", info->nickname, auth_cred_to_string(info->credentials));
diff --git a/src/util/ipcalc.c b/src/util/ipcalc.c
index 11737ae..388bc52 100644
--- a/src/util/ipcalc.c
+++ b/src/util/ipcalc.c
@@ -203,8 +203,7 @@ int ip_mask_create_left(int af, int bits, struct ip_addr_encap* result)
 		fill = (128-bits) / 8;
 		remain_bits = (128-bits) % 8;
 		mask = (0xff << (8 - remain_bits));
-		n = 0;
-		
+
 		for (n = 0; n < fill; n++)
 			((uint8_t*) &result->internal_ip_data.in6)[n] = (uint8_t) 0xff;
 		
@@ -252,7 +251,6 @@ int ip_mask_create_right(int af, int bits, struct ip_addr_encap* result)
 		fill = (128-bits) / 8;
 		remain_bits = (128-bits) % 8;
 		mask8 = (0xff >> (8 - remain_bits));
-		n = 0;
 		start = 16-fill;
 		
 		for (n = 0; n < start; n++)