diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h
index 7ea9422..1a8ea74 100644
--- a/lib/libZRCola/include/zrcola/translate.h
+++ b/lib/libZRCola/include/zrcola/translate.h
@@ -46,14 +46,14 @@ namespace ZRCola {
         /// Translation data
         ///
         struct translation {
-            unsigned __int16 rank;              ///< Decomposition rank
-            static unsigned __int16 com_start;  ///< Composed character start in \c data
+            unsigned __int16 rank;                      ///< Decomposition rank
+            static const unsigned __int16 com_start;    ///< Composed character start in \c data
             union {
-                unsigned __int16 com_end;       ///< Composed character end in \c data
-                unsigned __int16 dec_start;     ///< Decomposed character start in \c data
+                unsigned __int16 com_end;               ///< Composed character end in \c data
+                unsigned __int16 dec_start;             ///< Decomposed character start in \c data
             };
-            unsigned __int16 dec_end;           ///< Decomposed string end in \c data
-            wchar_t data[];                     ///< Decomposed string and composed character
+            unsigned __int16 dec_end;                   ///< Decomposed string end in \c data
+            wchar_t data[];                             ///< Decomposed string and composed character
         };
 #pragma pack(pop)
 
diff --git a/lib/libZRCola/src/translate.cpp b/lib/libZRCola/src/translate.cpp
index bd2b6ab..b644ac1 100644
--- a/lib/libZRCola/src/translate.cpp
+++ b/lib/libZRCola/src/translate.cpp
@@ -19,7 +19,7 @@
 
 #include "stdafx.h"
 
-unsigned __int16 ZRCola::translation_db::translation::com_start = 0;
+const unsigned __int16 ZRCola::translation_db::translation::com_start = 0;
 
 
 void ZRCola::translation_db::Compose(_In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _Out_ std::wstring &output, _Out_opt_ std::vector<mapping>* map) const