diff --git a/src/common/classes/RefCounted.h b/src/common/classes/RefCounted.h
index c56fd16f44..ad92e16b82 100644
--- a/src/common/classes/RefCounted.h
+++ b/src/common/classes/RefCounted.h
@@ -113,7 +113,7 @@ namespace Firebird
 			return assign(p);
 		}
 
-		T* operator=(RefPtr &p)
+		T* operator=(RefPtr& p)
 		{
 			return assign(p.ptr);
 		}
diff --git a/src/dsql/ddl.cpp b/src/dsql/ddl.cpp
index 40628a9152..3ea8868e48 100644
--- a/src/dsql/ddl.cpp
+++ b/src/dsql/ddl.cpp
@@ -6732,7 +6732,9 @@ static void modify_field(dsql_req*	request,
 			else if (defNod->nod_type == nod_del_default)
 				request->append_uchar(isc_dyn_del_default);
 			else
+			{
 				fb_assert(false);
+			}
 		}
 		else
 		{
diff --git a/src/jrd/intl.cpp b/src/jrd/intl.cpp
index 8f0df96e89..d34729ccde 100644
--- a/src/jrd/intl.cpp
+++ b/src/jrd/intl.cpp
@@ -797,7 +797,7 @@ int INTL_convert_string(dsc* to, const dsc* from, FPTR_ERROR err)
 		toLength != 31 &&	/* allow non CHARSET_LEGACY_SEMANTICS to be used as connection charset */
 		toCharSet->length(toLength, start, false) > to_size / toCharSet->maxBytesPerChar())
 	{
-		(*err)(isc_arith_except, isc_arg_gds, isc_transliteration_failed, 0);
+		(*err)(isc_arith_except, isc_arg_gds, isc_string_truncation, 0);
 	}
 
 	if (from_fill)
diff --git a/src/jrd/os/config_root.h b/src/jrd/os/config_root.h
index bc34d4af04..26966e0a66 100644
--- a/src/jrd/os/config_root.h
+++ b/src/jrd/os/config_root.h
@@ -88,7 +88,7 @@ public:
 
 	virtual ~ConfigRoot() {}
 
-	const char *getInstallDirectory() {
+	const char* getInstallDirectory() {
 		osConfigRoot();
 		return install_dir().c_str();
 	}
diff --git a/src/jrd/tra.h b/src/jrd/tra.h
index b7ae9bf543..16dca16e90 100644
--- a/src/jrd/tra.h
+++ b/src/jrd/tra.h
@@ -152,7 +152,7 @@ public:
 	DatabaseSnapshot* tra_db_snapshot; // Database state snapshot (for monitoring purposes)
 	RuntimeStatistics tra_stats;
 	Firebird::Array<dsql_req*> tra_open_cursors;
-	jrd_tra* const tra_outer;			// outer transaction of an autonomous transaction
+	jrd_tra* const tra_outer;	// outer transaction of an autonomous transaction
 
 private:
 	TempSpace* tra_temp_space;	// temp space storage
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
index d4d860a4fb..35b4745ac2 100644
--- a/src/remote/interface.cpp
+++ b/src/remote/interface.cpp
@@ -5128,9 +5128,9 @@ static bool batch_gds_receive(rem_port*		port,
 			break;
 
 #ifdef SCROLLABLE_CURSORS
-			/* if we are just trying to clear the queue, then NULL out the message 
-			   address so we don't get a record out of order--it would mess up 
-			   scrolling through the cache */
+		// if we are just trying to clear the queue, then NULL out the message 
+		// address so we don't get a record out of order--it would mess up 
+		// scrolling through the cache
 
 		message->msg_address = NULL;
 #endif
diff --git a/src/utilities/gsec/gsec.cpp b/src/utilities/gsec/gsec.cpp
index 6eb0011d11..fdd78014e2 100644
--- a/src/utilities/gsec/gsec.cpp
+++ b/src/utilities/gsec/gsec.cpp
@@ -630,7 +630,7 @@ static bool get_switches(
 
 				/* compare switch to switch name in table */
 
-				for(int l = 0; *p; ++l) {
+				for (int l = 0; *p; ++l) {
 					if (!*++p) {
 						if (l >= in_sw_tab->in_sw_min_length)
 							in_sw = in_sw_tab->in_sw;