diff --git a/mps/code/poolsnc.c b/mps/code/poolsnc.c
index 74ba6d3cab0..c9b1c20098e 100644
--- a/mps/code/poolsnc.c
+++ b/mps/code/poolsnc.c
@@ -643,8 +643,8 @@ static void SNCWalk(Pool pool, Seg seg, FormattedObjectsStepMethod f,
       limit = SegLimit(seg);
 
     while(object < limit) {
-      (*f)(object, pool->format, pool, p, s);
-      nextObject = (*pool->format->skip)(object);
+      (*f)(object, format, pool, p, s);
+      nextObject = (*format->skip)(object);
       AVER(nextObject > object);
       object = nextObject;
     }
diff --git a/mps/code/seg.c b/mps/code/seg.c
index f5218b2be8d..3f95ba4ec88 100644
--- a/mps/code/seg.c
+++ b/mps/code/seg.c
@@ -210,7 +210,7 @@ failInit:
 static void SegFinish(Seg seg)
 {
   Arena arena;
-  Addr addr, base, limit;
+  Addr addr, limit;
   Tract tract;
   SegClass class;