diff --git a/source/childwin.pas b/source/childwin.pas
index a11dacd6..68d652ad 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -1812,8 +1812,8 @@ begin
     begin
       VTRowDataListColumns[i-1].ImageIndex := ICONINDEX_FIELD;
       VTRowDataListColumns[i-1].Captions := WideStrings.TWideStringList.Create;
-      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Field').AsString );
-      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Type').AsString );
+      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Field').AsWideString );
+      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Type').AsWideString );
       if lowercase( FSelectedTableColumns.FieldByName('Null').AsString ) = 'yes' then
         VTRowDataListColumns[i-1].Captions.Add('Yes')
         else VTRowDataListColumns[i-1].Captions.Add('No');
@@ -1831,11 +1831,11 @@ begin
           // No default value.
           VTRowDataListColumns[i-1].Captions.Add('')
       else
-        VTRowDataListColumns[i-1].Captions.Add('''' + FSelectedTableColumns.FieldByName('Default').AsString + '''');
+        VTRowDataListColumns[i-1].Captions.Add('''' + FSelectedTableColumns.FieldByName('Default').AsWideString + '''');
 
-      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Extra').AsString );
+      VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Extra').AsWideString );
       if hasCommentColumn then
-        VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Comment').AsString )
+        VTRowDataListColumns[i-1].Captions.Add( FSelectedTableColumns.FieldByName('Comment').AsWideString )
       else
         VTRowDataListColumns[i-1].Captions.Add('');
 
diff --git a/source/fieldeditor.dfm b/source/fieldeditor.dfm
index 6c1602ef..4a305ca8 100644
--- a/source/fieldeditor.dfm
+++ b/source/fieldeditor.dfm
@@ -89,7 +89,7 @@ object FieldEditForm: TFieldEditForm
         TabOrder = 3
         OnClick = btnDatatypeHelpClick
       end
-      object EditDefault: TEdit
+      object EditDefault: TTntEdit
         Left = 88
         Top = 109
         Width = 192
@@ -116,7 +116,7 @@ object FieldEditForm: TFieldEditForm
         OnKeyDown = ComboBoxTypeKeyDown
         OnKeyUp = ComboBoxTypeKeyUp
       end
-      object EditFieldname: TEdit
+      object EditFieldname: TTntEdit
         Left = 88
         Top = 37
         Width = 192
@@ -182,7 +182,7 @@ object FieldEditForm: TFieldEditForm
         ItemHeight = 13
         TabOrder = 0
       end
-      object EditComment: TEdit
+      object EditComment: TTntEdit
         Left = 88
         Top = 133
         Width = 192
diff --git a/source/fieldeditor.pas b/source/fieldeditor.pas
index 6ca3f631..fd0a7267 100644
--- a/source/fieldeditor.pas
+++ b/source/fieldeditor.pas
@@ -25,10 +25,10 @@ type
     lblType: TLabel;
     lblLengthSet: TLabel;
     lblDefault: TLabel;
-    EditDefault: TEdit;
+    EditDefault: TTntEdit;
     EditLength: TEdit;
     ComboBoxType: TComboBox;
-    EditFieldname: TEdit;
+    EditFieldname: TTntEdit;
     GroupBoxAttributes: TGroupBox;
     CheckBoxBinary: TCheckBox;
     CheckBoxUnsigned: TCheckBox;
@@ -55,7 +55,7 @@ type
     btnDeleteAllColumnsFromIndex: TPngSpeedButton;
     btnDatatypeHelp: TButton;
     lblComment: TLabel;
-    EditComment: TEdit;
+    EditComment: TTntEdit;
     procedure FormCreate(Sender: TObject);
     procedure btnDatatypeHelpClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -427,7 +427,7 @@ var
   strComment,
   strPosition,
   fielddef,
-  sql_alterfield   : String;
+  sql_alterfield   : WideString;
   cwin : TMDIChild;
   i: Integer;
 begin
@@ -813,8 +813,8 @@ end;
 procedure TFieldEditForm.UpdateKeys(Sender: TObject);
 var
   i,j,k, index : Integer;
-  query : String;
-  columns_sql : String;
+  query : WideString;
+  columns_sql : WideString;
   modifiedKeys : Array of Integer;
 begin
   query := '';
diff --git a/source/mysql_structures.pas b/source/mysql_structures.pas
index b8fa051a..878e800e 100644
--- a/source/mysql_structures.pas
+++ b/source/mysql_structures.pas
@@ -14,7 +14,7 @@ uses
 type
   // MySQL Index structure
   TMysqlIndex = record
-    Name:     String[64];
+    Name:     WideString;
     Columns:  TStringList;
     Unique:   Boolean;
     Fulltext: Boolean;