diff --git a/COPYING b/COPYING
index d60c31a97..ecb192b2a 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/utils/fgadmin/src/untarka.c b/utils/fgadmin/src/untarka.c
index 0b096784e..3336ba1ba 100644
--- a/utils/fgadmin/src/untarka.c
+++ b/utils/fgadmin/src/untarka.c
@@ -847,16 +847,17 @@ static unsigned lz_read(struct lz_reader_t* reader, char* outbuf, unsigned obufs
 
       if (code >= freeent) {    /* Special case for KwKwK string.    */
         if (code > freeent) {
-            REG1 char_type         *p;
-
             posbits -= n_bits;
-            p = &inbuf[posbits>>3];
-
 #if 0
-            fprintf(stderr, "uncompress: insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)\n", insize, posbits,
-                    p[-1],p[0],p[1],p[2],p[3], (posbits&07));
-            fprintf(stderr, "uncompress: corrupt input\n");
-            abort();
+            {
+                REG1 char_type         *p;
+                p = &inbuf[posbits>>3];
+
+                fprintf(stderr, "uncompress: insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)\n", insize, posbits,
+                        p[-1],p[0],p[1],p[2],p[3], (posbits&07));
+                fprintf(stderr, "uncompress: corrupt input\n");
+                abort();
+            }
 #else
             return reader->rsize=-1;
 #endif