diff --git a/doc/README.incompatibilities.txt b/doc/README.incompatibilities.txt
index 08eb78a1fd..84a1fde757 100644
--- a/doc/README.incompatibilities.txt
+++ b/doc/README.incompatibilities.txt
@@ -45,7 +45,7 @@ SQL EXECUTION RESULTS
     conform to the SQL standard. Starting with Firebird 2.5, only OLD column
     values are accessible to all the assignments of the SET clause.
     You can revert back to the legacy behavior via the OldSetClauseSemantics
-    parameter of firebird.conf, if required. Please beware that this parameter
+    parameter of firebird.conf, if required. Please be aware that this parameter
     is provided as a temporary solution for backward compatibility issues and
     will be deprecated in future Firebird versions.
 
diff --git a/src/jrd/DatabaseSnapshot.cpp b/src/jrd/DatabaseSnapshot.cpp
index 7f5cde870a..1e1b322166 100644
--- a/src/jrd/DatabaseSnapshot.cpp
+++ b/src/jrd/DatabaseSnapshot.cpp
@@ -75,7 +75,7 @@ const UCHAR TAG_RECORD = MAX_UCHAR;
 DatabaseSnapshot::SharedData::SharedData(const Database* dbb)
 	: process_id(getpid()), local_id(dbb->dbb_monitoring_id)
 {
-	Firebird::string name;
+	string name;
 	name.printf(MONITOR_FILE, dbb->getUniqueFileId().c_str());
 
 	ISC_STATUS_ARRAY statusVector;
diff --git a/src/jrd/event.cpp b/src/jrd/event.cpp
index ca5f797a3e..cdf570b251 100644
--- a/src/jrd/event.cpp
+++ b/src/jrd/event.cpp
@@ -399,6 +399,7 @@ void EventManager::postEvent(USHORT major_length, const TEXT* major_code,
 
 	evnt* event;
 	evnt* const parent = find_event(major_length, major_code, 0);
+
 	if (parent && (event = find_event(minor_length, minor_code, parent)))
 	{
 		event->evnt_count += count;
diff --git a/src/jrd/event_proto.h b/src/jrd/event_proto.h
index 07243c3808..75a345acd2 100644
--- a/src/jrd/event_proto.h
+++ b/src/jrd/event_proto.h
@@ -35,7 +35,7 @@ namespace Jrd {
 
 class Database;
 
-class EventManager: public Firebird::RefCounted, public Firebird::GlobalStorage
+class EventManager : public Firebird::RefCounted, public Firebird::GlobalStorage
 {
 	typedef Firebird::GenericMap<Firebird::Pair<Firebird::Left<Firebird::string, EventManager*> > > DbEventMgrMap;
 
diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp
index 9f53a5059e..be0db661c9 100644
--- a/src/lock/lock.cpp
+++ b/src/lock/lock.cpp
@@ -501,7 +501,7 @@ SRQ_PTR LockManager::enqueue(thread_db* tdbb,
 		else {
 			++m_header->lhb_operations[0];
 		}
-	
+
 		insert_tail(&lock->lbl_requests, &request->lrq_lbl_requests);
 		request->lrq_data = data;
 		const SRQ_PTR lock_id = grant_or_que(tdbb, request, lock, lck_wait);