diff --git a/commands/CmdTZ.c b/commands/CmdTZ.c
index 56fa95b3..8f8681ef 100644
--- a/commands/CmdTZ.c
+++ b/commands/CmdTZ.c
@@ -415,10 +415,12 @@ CmdTech(w, cmd)
 
 	    for (ctype = TT_TECHDEPBASE; ctype < DBNumUserLayers; ctype++)
 		if (DBIsContact(ctype))
+		{
 		    if (TTMaskHasType(&DBActiveLayerBits, ctype))
 			DBUnlockContact(ctype);
 		    else
 			DBLockContact(ctype);
+		}
 
 	    for (ctype = DBNumUserLayers; ctype < DBNumTypes; ctype++)
 	    {
diff --git a/database/DBio.c b/database/DBio.c
index be3f11f0..bf663bac 100644
--- a/database/DBio.c
+++ b/database/DBio.c
@@ -1420,9 +1420,10 @@ dbReadOpen(cellDef, setFileName, dereference, errptr)
 
 	pptr = strrchr(sptr, '.');
 	if (pptr != NULL)
+	{
 	    if (strcmp(pptr, DBSuffix)) pptr = NULL;
-	else
-	    *pptr = '\0';
+	    else *pptr = '\0';
+	}
 
 	/* If dereferencing, then use search paths first */
 	if (!dereference)
diff --git a/database/DBpaint2.c b/database/DBpaint2.c
index de3a1cbe..aa82305b 100644
--- a/database/DBpaint2.c
+++ b/database/DBpaint2.c
@@ -283,6 +283,7 @@ DBPaintValid(cellDef, rect, mask, dinfo)
 
     for (t = TT_SELECTBASE; t < DBNumUserLayers; t++)
 	if (TTMaskHasType(&mmask, t))
+	{
 	    if (DBIsContact(t))
 	    {
 		tMask = DBResidueMask(t);
@@ -310,6 +311,7 @@ DBPaintValid(cellDef, rect, mask, dinfo)
 				(t << 14) : t) : t);
 		DBPaint(cellDef, rect, tloc);
 	    }
+	}
 }
 
 /*
@@ -382,6 +384,7 @@ DBEraseValid(cellDef, rect, mask, dinfo)
 
     for (t = TT_SELECTBASE; t < DBNumUserLayers; t++)
 	if (TTMaskHasType(&mmask, t))
+	{
 	    if (DBIsContact(t))
 	    {
 		tMask = DBResidueMask(t);
@@ -409,4 +412,5 @@ DBEraseValid(cellDef, rect, mask, dinfo)
 			 (t << 14) : t) : t);
 		DBErase(cellDef, rect, tloc);
 	    }
+	}
 }