diff --git a/components/lazmapviewer/examples/trackdemo/main.lfm b/components/lazmapviewer/examples/trackdemo/main.lfm
index f0a3593c7..3b0fe6b0c 100644
--- a/components/lazmapviewer/examples/trackdemo/main.lfm
+++ b/components/lazmapviewer/examples/trackdemo/main.lfm
@@ -6,8 +6,8 @@ object MainForm: TMainForm
   Caption = 'Grand Canyon Hike'
   ClientHeight = 600
   ClientWidth = 1000
+  LCLVersion = '3.99.0.0'
   OnActivate = FormActivate
-  LCLVersion = '2.3.0.0'
   object MapView: TMapView
     Left = 0
     Height = 600
@@ -281,8 +281,8 @@ object MainForm: TMainForm
       Anchors = [akLeft, akBottom]
       BorderSpacing.Top = 8
       Caption = 'Trace track automatically'
-      OnChange = cbAutoTraceChange
       TabOrder = 1
+      OnChange = cbAutoTraceChange
     end
     object Label1: TLabel
       AnchorSideLeft.Control = Panel1
@@ -309,8 +309,8 @@ object MainForm: TMainForm
       Anchors = [akLeft, akRight, akBottom]
       DropDownCount = 32
       ItemHeight = 16
-      OnChange = clbTrackColorChange
       TabOrder = 2
+      OnChange = clbTrackColorChange
     end
     object lblInfo: TLabel
       AnchorSideLeft.Control = Panel1
@@ -362,8 +362,8 @@ object MainForm: TMainForm
       Width = 79
       BorderSpacing.Left = 16
       Caption = 'Use threads'
-      OnChange = cbUseThreadsChange
       TabOrder = 3
+      OnChange = cbUseThreadsChange
     end
   end
   object Splitter1: TSplitter
diff --git a/components/lazmapviewer/examples/trackdemo/main.pas b/components/lazmapviewer/examples/trackdemo/main.pas
index 1888c17b2..e73eb95d7 100644
--- a/components/lazmapviewer/examples/trackdemo/main.pas
+++ b/components/lazmapviewer/examples/trackdemo/main.pas
@@ -179,7 +179,7 @@ begin
   FCurrPt.Name := Format('Time: %s'+LineEnding+'Elevation: %.0fm', [
     TimeToStr(FCurrPt.DateTime), FCurrPt.Elevation
   ]);
-  MapView.Engine.Redraw;
+  MapView.Invalidate;
 end;
 
 procedure TMainForm.TrackGridClick(Sender: TObject);
diff --git a/components/lazmapviewer/source/mvengine.pas b/components/lazmapviewer/source/mvengine.pas
index 433634068..16ccd53ce 100644
--- a/components/lazmapviewer/source/mvengine.pas
+++ b/components/lazmapviewer/source/mvengine.pas
@@ -1086,7 +1086,7 @@ begin
     Mapwin.Center := aCenter;
     CalculateWin(MapWin);
     Redraw(MapWin);
-    if assigned(OnCenterMove) then
+    if Assigned(OnCenterMove) then
       OnCenterMove(Self);
     if Assigned(OnChange) then
       OnChange(Self);