diff --git a/src/dsql/Nodes.h b/src/dsql/Nodes.h
index 81c19c8120..827050ec9c 100644
--- a/src/dsql/Nodes.h
+++ b/src/dsql/Nodes.h
@@ -223,15 +223,9 @@ public:
 		return obj ? obj->as<T>() : NULL;
 	}
 
-	template <typename T, typename LegacyType> static const T* const_as(const LegacyType* node)
-	{
-		const ExprNode* obj = T::fromLegacy(node);
-		return obj ? obj->as<T>() : NULL;
-	}
-
 	template <typename T, typename LegacyType> static bool is(const LegacyType* node)
 	{
-		ExprNode* obj = T::fromLegacy(node);
+		const ExprNode* obj = T::fromLegacy(node);
 		return obj ? obj->is<T>() : false;
 	}
 
diff --git a/src/include/types_pub.h b/src/include/types_pub.h
index e1375302cf..8578e05a3e 100644
--- a/src/include/types_pub.h
+++ b/src/include/types_pub.h
@@ -66,7 +66,7 @@ typedef ISC_STATUS ISC_STATUS_ARRAY[ISC_STATUS_LENGTH];
 
 /* SQL State as defined in the SQL Standard. */
 #define FB_SQLSTATE_LENGTH	5
-#define FB_SQLSTATE_SIZE	FB_SQLSTATE_LENGTH + 1
+#define FB_SQLSTATE_SIZE	(FB_SQLSTATE_LENGTH + 1)
 typedef char FB_SQLSTATE_STRING[FB_SQLSTATE_SIZE];
 
 /******************************************************************/
diff --git a/src/jrd/cmp.cpp b/src/jrd/cmp.cpp
index 05f102bc62..8485221320 100644
--- a/src/jrd/cmp.cpp
+++ b/src/jrd/cmp.cpp
@@ -1756,8 +1756,7 @@ void CMP_get_desc(thread_db* tdbb, CompilerScratch* csb, jrd_nod* node, DSC* des
 	case nod_current_role:
 		desc->dsc_dtype = dtype_text;
 		desc->dsc_ttype() = ttype_metadata;
-		// ASF: should be multiplied by maxBytesPerChar of ttype_metadata in the future
-		desc->dsc_length = USERNAME_LENGTH;
+		desc->dsc_length = USERNAME_LENGTH * METADATA_BYTES_PER_CHAR;
 		desc->dsc_scale = 0;
 		desc->dsc_flags = 0;
 		return;
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
index 3f1baaf5d7..a9a7b910b6 100644
--- a/src/remote/interface.cpp
+++ b/src/remote/interface.cpp
@@ -4657,7 +4657,6 @@ static rem_port* analyze(PathName& file_name,
 
 #endif // SUPERCLIENT
 
-
 	if (port || status_vector[1])
 	{
 		return port;
diff --git a/src/remote/xnet_proto.h b/src/remote/xnet_proto.h
index a7c89cca45..a3485062ad 100644
--- a/src/remote/xnet_proto.h
+++ b/src/remote/xnet_proto.h
@@ -40,4 +40,3 @@ rem_port* XNET_reconnect(ULONG, ISC_STATUS*);
 #endif
 
 #endif // REMOTE_XNET_PROTO_H
-