diff --git a/src/jrd/IntlUtil.cpp b/src/jrd/IntlUtil.cpp
index 003a7f84e3..1cf6661c7f 100644
--- a/src/jrd/IntlUtil.cpp
+++ b/src/jrd/IntlUtil.cpp
@@ -147,8 +147,8 @@ bool IntlUtil::parseSpecificAttributes(Jrd::CharSet* cs, ULONG len, const UCHAR*
 
 			if (uSize == 2 &&
 				((*(USHORT*) uc >= 'A' && *(USHORT*) uc <= 'Z') ||
-				 (*(USHORT*) uc >= 'a' && *(USHORT*) uc <= 'z') ||
-				 *(USHORT*) uc == '-' || *(USHORT*) uc == '_'))
+					(*(USHORT*) uc >= 'a' && *(USHORT*) uc <= 'z') ||
+					*(USHORT*) uc == '-' || *(USHORT*) uc == '_'))
 			{
 				if (!readAttributeChar(cs, &p, end, &size, true))
 					return false;
@@ -195,7 +195,7 @@ bool IntlUtil::parseSpecificAttributes(Jrd::CharSet* cs, ULONG len, const UCHAR*
 				if (uSize != 2 || *(USHORT*)uc != ';')
 				{
 					if (!(size == cs->getSpaceLength() &&
-						  memcmp(p, cs->getSpace(), cs->getSpaceLength()) == 0))
+						memcmp(p, cs->getSpace(), cs->getSpaceLength()) == 0))
 					{
 						endNoSpace = p + size;
 					}
@@ -649,7 +649,7 @@ bool IntlUtil::readAttributeChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR*
 
 static void unicodeDestroy(texttype* tt)
 {
-	delete [] const_cast<ASCII*>(tt->texttype_name);
+	delete[] const_cast<ASCII*>(tt->texttype_name);
 	delete static_cast<TextTypeImpl*>(tt->texttype_impl);
 }
 
diff --git a/src/jrd/ini.h b/src/jrd/ini.h
index 9013672318..bc3bfa5d8d 100644
--- a/src/jrd/ini.h
+++ b/src/jrd/ini.h
@@ -40,9 +40,9 @@
 
 #define NAME(name, id) id,
 
-typedef enum nam_i { nam_MIN,
+enum name_ids { nam_MIN,
 #include "../jrd/names.h"
-nam_MAX} name_ids;
+nam_MAX};
 
 #undef NAME
 
diff --git a/src/utilities/install/install.cpp b/src/utilities/install/install.cpp
index e9cc24500f..c2c88fd14e 100644
--- a/src/utilities/install/install.cpp
+++ b/src/utilities/install/install.cpp
@@ -454,7 +454,7 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
 	if (! GetFileVersionInfo(const_cast<TEXT*>(filename), 0, rsize, hver))
 	{
 		ULONG werr = GetLastError();
-		delete [] hver;
+		delete[] hver;
 		CloseHandle(hfile);
 		return (*err_handler) (werr, "GetFileVersionInfo()");
 	}
@@ -465,14 +465,14 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
 	if (! VerQueryValue(hver, "\\", (void**)&ffi, &uiUnused))
 	{
 		ULONG werr = GetLastError();
-		delete [] hver;
+		delete[] hver;
 		return (*err_handler) (werr, "VerQueryValue()");
 	}
 
 	verMS = ffi->dwFileVersionMS;
 	verLS = ffi->dwFileVersionLS;
 
-	delete [] hver;
+	delete[] hver;
 	return FB_SUCCESS;
 }