diff --git a/src/include/firebird/impl/msg/jrd.h b/src/include/firebird/impl/msg/jrd.h
index b693a3b83a2..cef871febd6 100644
--- a/src/include/firebird/impl/msg/jrd.h
+++ b/src/include/firebird/impl/msg/jrd.h
@@ -10,7 +10,7 @@ FB_IMPL_MSG(JRD, 8, bad_segstr_handle, -901, "42", "000", "invalid BLOB handle")
 FB_IMPL_MSG(JRD, 9, bad_segstr_id, -901, "42", "000", "invalid BLOB ID")
 FB_IMPL_MSG(JRD, 10, bad_tpb_content, -901, "HY", "000", "invalid parameter in transaction parameter block")
 FB_IMPL_MSG(JRD, 11, bad_tpb_form, -901, "HY", "000", "invalid format for transaction parameter block")
-FB_IMPL_MSG(JRD, 12, bad_trans_handle, -901, "08", "003", "invalid transaction handle (expecting explicit transaction start)")
+FB_IMPL_MSG(JRD, 12, bad_trans_handle, -901, "HY", "000", "invalid transaction handle (expecting explicit transaction start)")
 FB_IMPL_MSG(JRD, 13, bug_check, -902, "XX", "000", "internal Firebird consistency check (@1)")
 FB_IMPL_MSG(JRD, 14, convert_error, -413, "22", "018", "conversion error from string \"@1\"")
 FB_IMPL_MSG(JRD, 15, db_corrupt, -902, "XX", "001", "database file appears corrupt (@1)")
@@ -298,7 +298,7 @@ FB_IMPL_MSG(JRD, 296, field_ref_err, -829, "42", "S22", "invalid column referenc
 FB_IMPL_MSG(JRD, 297, order_by_err, -208, "42", "000", "invalid ORDER BY clause")
 FB_IMPL_MSG(JRD, 298, return_mode_err, -171, "HY", "000", "Return mode by value not allowed for this data type")
 FB_IMPL_MSG(JRD, 299, extern_func_err, -170, "38", "000", "External functions cannot have more than 10 parameters")
-FB_IMPL_MSG(JRD, 300, alias_conflict_err, -204, "08", "001", "alias @1 conflicts with an alias in the same statement")
+FB_IMPL_MSG(JRD, 300, alias_conflict_err, -204, "42", "000", "alias @1 conflicts with an alias in the same statement")
 FB_IMPL_MSG(JRD, 301, procedure_conflict_error, -204, "42", "000", "alias @1 conflicts with a procedure in the same statement")
 FB_IMPL_MSG(JRD, 302, relation_conflict_err, -204, "42", "000", "alias @1 conflicts with a table in the same statement")
 FB_IMPL_MSG(JRD, 303, dsql_domain_err, -901, "42", "000", "Illegal use of keyword VALUE")
@@ -699,7 +699,7 @@ FB_IMPL_MSG(JRD, 697, async_active, -532, "HY", "018", "Asynchronous call is alr
 FB_IMPL_MSG(JRD, 698, private_function, -901, "42", "000", "Function @1 is private to package @2")
 FB_IMPL_MSG(JRD, 699, private_procedure, -901, "42", "000", "Procedure @1 is private to package @2")
 FB_IMPL_MSG(JRD, 700, request_outdated, -904, "24", "000", "Request can't access new records in relation @1 and should be recompiled")
-FB_IMPL_MSG(JRD, 701, bad_events_handle, -901, "08", "003", "invalid events id (handle)")
+FB_IMPL_MSG(JRD, 701, bad_events_handle, -901, "HY", "000", "invalid events id (handle)")
 FB_IMPL_MSG(JRD, 702, cannot_copy_stmt, -104, "XX", "000", "Cannot copy statement @1")
 FB_IMPL_MSG(JRD, 703, invalid_boolean_usage, -104, "22", "000", "Invalid usage of boolean expression")
 FB_IMPL_MSG(JRD, 704, sysf_argscant_both_be_zero, -833, "42", "000", "Arguments for @1 cannot both be zero")
@@ -838,7 +838,7 @@ FB_IMPL_MSG(JRD, 835, invalid_decfloat_round, -901, "42", "000", "Invalid decflo
 FB_IMPL_MSG(JRD, 836, sysf_invalid_first_last_part, -833, "42", "000", "Invalid part @1 to calculate the @1 of a DATE/TIMESTAMP")
 FB_IMPL_MSG(JRD, 837, sysf_invalid_date_timestamp, -833, "42", "000", "Expected DATE/TIMESTAMP value in @1")
 FB_IMPL_MSG(JRD, 838, precision_err2, -842, "HY", "104", "Precision must be from @1 to @2")
-FB_IMPL_MSG(JRD, 839, bad_batch_handle, -901, "08", "003", "invalid batch handle")
+FB_IMPL_MSG(JRD, 839, bad_batch_handle, -901, "HY", "000", "invalid batch handle")
 FB_IMPL_MSG(JRD, 840, intl_char, -901, "22", "021", "Bad international character in tag @1")
 FB_IMPL_MSG(JRD, 841, null_block, -901, "22", "000", "Null data in parameters block with non-zero length")
 FB_IMPL_MSG(JRD, 842, mixed_info, -901, "22", "000", "Items working with running service and getting generic server information should not be mixed in single info block")
@@ -863,7 +863,7 @@ FB_IMPL_MSG(JRD, 860, non_plugin_protocol, -902, "08", "004", "Plugin not suppor
 FB_IMPL_MSG(JRD, 861, message_format, -901, "22", "000", "Error parsing message format")
 FB_IMPL_MSG(JRD, 862, batch_param_version, -901, "22", "000", "Wrong version of batch parameters block @1, should be @2")
 FB_IMPL_MSG(JRD, 863, batch_msg_long, -901, "54", "000", "Message size (@1) in batch exceeds internal buffer size (@2)")
-FB_IMPL_MSG(JRD, 864, batch_open, -901, "08", "002", "Batch already opened for this statement")
+FB_IMPL_MSG(JRD, 864, batch_open, -901, "HY", "010", "Batch already opened for this statement")
 FB_IMPL_MSG(JRD, 865, batch_type, -901, "07", "003", "Invalid type of statement used in batch")
 FB_IMPL_MSG(JRD, 866, batch_param, -901, "07", "001", "Statement used in batch must have parameters")
 FB_IMPL_MSG(JRD, 867, batch_blobs, -901, "07", "001", "There are no blobs in associated with batch statement")