diff --git a/lib/formatter.c b/lib/formatter.c
index 444d5c6..d187381 100644
--- a/lib/formatter.c
+++ b/lib/formatter.c
@@ -60,7 +60,7 @@ asciiPrintProduct(
     const int* const		powers,
     const int			count,
     char* const			buf,
-    const size_t		max,
+    const size_t		size,
     IdGetter			getId);
 static int
 latin1PrintProduct(
@@ -68,7 +68,7 @@ latin1PrintProduct(
     const int* const		powers,
     const int			count,
     char* const			buf,
-    const size_t		max,
+    const size_t		size,
     IdGetter			getId);
 static int
 utf8PrintProduct(
@@ -76,7 +76,7 @@ utf8PrintProduct(
     const int* const		powers,
     const int			count,
     char* const			buf,
-    const size_t		max,
+    const size_t		size,
     IdGetter			getId);
 
 static ut_visitor	formatter;
diff --git a/lib/unitAndId.c b/lib/unitAndId.c
index 032a54e..c03f421 100644
--- a/lib/unitAndId.c
+++ b/lib/unitAndId.c
@@ -91,11 +91,11 @@ uaiNew(
  */
 void
 uaiFree(
-    UnitAndId* const	entry)
+    UnitAndId* const	node)
 {
-    if (entry != NULL) {
-	free(entry->id);
-	ut_free(entry->unit);
-	free(entry);
+    if (node != NULL) {
+	free(node->id);
+	ut_free(node->unit);
+	free(node);
     }
 }