diff --git a/builds/posix/Makefile.in.static.gpre b/builds/posix/Makefile.in.static.gpre
index 5a73892cf2..a070ecf01a 100644
--- a/builds/posix/Makefile.in.static.gpre
+++ b/builds/posix/Makefile.in.static.gpre
@@ -27,8 +27,6 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.static.gpre,v 1.21 2008-02-14 10:08:04 alexpeshkoff Exp $
-#
 ROOT=..
 ObjModuleType=boot
 CFLAGS += -DBOOT_BUILD
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
index e2ad52e94b..bd01fb4672 100644
--- a/src/jrd/jrd.cpp
+++ b/src/jrd/jrd.cpp
@@ -6274,7 +6274,9 @@ static ISC_STATUS unwindAttach(const Firebird::Exception& ex,
 		}
 	}
 	catch (const Firebird::Exception&)
-	{} // no-op
+	{
+		// no-op
+	}
 
 	tdbb->tdbb_status_vector = save_status;
 	databases_mutex->leave();
diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp
index 006ae02e97..2f86d6b33c 100644
--- a/src/lock/lock.cpp
+++ b/src/lock/lock.cpp
@@ -2578,8 +2578,7 @@ static USHORT lock_state(lbl* lock)
 }
 
 
-static void post_blockage(lrq* request,
-						  lbl* lock)
+static void post_blockage(lrq* request, lbl* lock)
 {
 /**************************************
  *