diff --git a/components/rx/folderlister.pas b/components/rx/folderlister.pas
index eab5788c8..cbb58ce13 100644
--- a/components/rx/folderlister.pas
+++ b/components/rx/folderlister.pas
@@ -146,7 +146,7 @@ begin
         AFolderList.Add(S+Rec.Name)
       else
       begin
-        if AnsiLowerCase(ExtractFileExt(Rec.Name))=AnsiLowerCase(FDefaultExt) then
+        if UTF8LowerCase(ExtractFileExt(Rec.Name))=UTF8LowerCase(FDefaultExt) then
           AFileList.Add(S+Rec.Name);
       end;
       R:=FindNextUTF8(Rec);
diff --git a/components/rx/rxdbgrid.pas b/components/rx/rxdbgrid.pas
index 62373d7b2..541a61518 100644
--- a/components/rx/rxdbgrid.pas
+++ b/components/rx/rxdbgrid.pas
@@ -29,18 +29,21 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
+{$I rx.inc}
 
 unit rxdbgrid;
 
-{$I rx.inc}
-
 interface
 
 uses
-  Classes, SysUtils, LResources, LCLType, LCLIntf, Forms, Controls, Buttons,
+  Classes, SysUtils, LResources, LCLVersion, LCLType, LCLIntf, Forms, Controls, Buttons,
   Graphics, Dialogs, Grids, dbutils, DBGrids, DB, PropertyStorage, vclutils,
   LMessages, types, StdCtrls, Menus;
 
+{$if ((lcl_major = 1) and (lcl_minor = 1))}
+  {$DEFINE RX_USE_LCL_DEVEL}
+{$ENDIF}
+
 const
   CBadQuickSearchSymbols = [VK_UNKNOWN..VK_HELP] + [VK_LWIN..VK_SLEEP] +
     [VK_NUMLOCK..VK_SCROLL] + [VK_LSHIFT..VK_OEM_102] + [VK_PROCESSKEY] +
@@ -617,7 +620,9 @@ type
     procedure UpdateActive; override;
     procedure UpdateData; override;
     procedure MoveSelection; override;
+{$IFDEF RX_USE_LCL_DEVEL}
     function  GetBufferCount: integer; override;
+{$ENDIF}
     procedure CMHintShow(var Message: TLMessage); message CM_HINTSHOW;
     procedure FFilterListEditorOnChange(Sender: TObject);
     procedure FFilterListEditorOnCloseUp(Sender: TObject);
@@ -3623,6 +3628,7 @@ begin
 //  UpdateRowsHeight;
 end;
 
+{$IFDEF RX_USE_LCL_DEVEL}
 function TRxDBGrid.GetBufferCount: integer;
 var
   H:integer;
@@ -3641,6 +3647,7 @@ begin
   if FFooterOptions.Active then
     Dec(Result, FFooterOptions.RowCount);
 end;
+{$ENDIF}
 
 procedure TRxDBGrid.CMHintShow(var Message: TLMessage);
 var
diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index 20eaffda8..2ef62eb73 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -1520,9 +1520,11 @@ begin
   end;
   FLocateObject.DataSet := DataSet;
 
-
-  if FListActive and Assigned(FDataField) then UpdateKeyValue
-  else KeyValueChanged;
+  if not (csDestroying in ComponentState) then
+  begin
+    if FListActive and Assigned(FDataField) then UpdateKeyValue
+    else KeyValueChanged;
+  end;
 end;
 
 procedure TRxCustomDBLookupCombo.SetValue(const Value: string);