diff --git a/components/lazmapviewer/examples/colored_tracks/coloredtracks_demo.lpi b/components/lazmapviewer/examples/colored_tracks/coloredtracks_demo.lpi
index 5661a0327..0cda6d903 100644
--- a/components/lazmapviewer/examples/colored_tracks/coloredtracks_demo.lpi
+++ b/components/lazmapviewer/examples/colored_tracks/coloredtracks_demo.lpi
@@ -60,6 +60,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/lazmapviewer/examples/colored_tracks/main.lfm b/components/lazmapviewer/examples/colored_tracks/main.lfm
index c4bbb4a12..e1dfcc3db 100644
--- a/components/lazmapviewer/examples/colored_tracks/main.lfm
+++ b/components/lazmapviewer/examples/colored_tracks/main.lfm
@@ -19,7 +19,6 @@ object MainForm: TMainForm
     DrawingEngine = MapView.BuiltInDE
     Font.Color = clBlack
     MapProvider = 'OpenStreetMap Mapnik'
-    POIImagesWidth = 0
     UseThreads = True
     OnZoomChange = MapViewZoomChange
   end
@@ -71,9 +70,9 @@ object MainForm: TMainForm
       Left = 339
       Height = 19
       Top = 19
-      Width = 117
+      Width = 156
       BorderSpacing.Left = 24
-      Caption = 'Triangle Loop Tour'
+      Caption = 'Triangle Loop Tour (black)'
       Checked = True
       OnChange = CheckBox3Change
       State = cbChecked
diff --git a/components/lazmapviewer/examples/colored_tracks/main.pas b/components/lazmapviewer/examples/colored_tracks/main.pas
index 85d925a5a..387de7add 100644
--- a/components/lazmapviewer/examples/colored_tracks/main.pas
+++ b/components/lazmapviewer/examples/colored_tracks/main.pas
@@ -71,14 +71,14 @@ begin
     MapView.Active := true;
 
     // Load GPX files
-    FTrack1 := LoadGPXFile(FILENAME1, clRed, 1.0);
+    FTrack1 := LoadGPXFile(Application.Location + FILENAME1, clRed, 1.0);
     FTrack1.GetArea(totalArea);
 
-    FTrack2 := LoadGPXFile(FILENAME2, clBlue, 1.2);
+    FTrack2 := LoadGPXFile(Application.Location + FILENAME2, clBlue, 1.2);
     FTrack2.GetArea(trackArea);
     ExtendArea(totalArea, trackArea);
 
-    FTrack3 := LoadGPXFile(FILENAME3, clBlack, 0.5);
+    FTrack3 := LoadGPXFile(Application.Location + FILENAME3, clBlack, 0.5);
     FTrack3.GetArea(trackArea);
     ExtendArea(totalArea, trackArea);
 
diff --git a/components/lazmapviewer/examples/trackdemo/main.lfm b/components/lazmapviewer/examples/trackdemo/main.lfm
index 58d5df8c6..f0a3593c7 100644
--- a/components/lazmapviewer/examples/trackdemo/main.lfm
+++ b/components/lazmapviewer/examples/trackdemo/main.lfm
@@ -22,7 +22,7 @@ object MainForm: TMainForm
     Font.CharSet = ANSI_CHARSET
     Font.Color = clBlack
     Font.Pitch = fpVariable
-    MapProvider = 'OpenStreetMap Mapnik'
+    MapProvider = 'Google Maps'
     POIImage.Data = {
       36170000424D36170000000000003600000028000000200000002E0000000100
       2000000000000017000064000000640000000000000000000000FFFFFF00FFFF
@@ -211,7 +211,6 @@ object MainForm: TMainForm
       FEEB0000FEC70000FE980000FD570000EA0CFFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
     }
-    POIImagesWidth = 0
     POITextBgColor = clCream
     OnCenterMove = MapViewCenterMove
     OnZoomChange = MapViewZoomChange
diff --git a/components/lazmapviewer/examples/trackdemo/main.pas b/components/lazmapviewer/examples/trackdemo/main.pas
index 4196c618a..1888c17b2 100644
--- a/components/lazmapviewer/examples/trackdemo/main.pas
+++ b/components/lazmapviewer/examples/trackdemo/main.pas
@@ -74,7 +74,7 @@ begin
   crs := Screen.Cursor;
   Screen.Cursor := crHourglass;
   try
-    MapView.MapProvider := 'Open Topo Map';
+    MapView.MapProvider := 'Google Maps'; //'Open Topo Map';
     MapView.Active := true;
     // Center on Grand Canyon Village
     MapView.Zoom := 13;
@@ -134,7 +134,7 @@ var
 begin
   reader := TGpxReader.Create;
   try
-    reader.LoadFromFile(GPX_FILE_NAME, MapView.GPSItems, b);
+    reader.LoadFromFile(Application.Location + GPX_FILE_NAME, MapView.GPSItems, b);
     MapView.Engine.ZoomOnArea(b);
     FTrack := MapView.GpsItems.GetObjectsInArea(b).Items[0] as TGpsTrack;
 
diff --git a/components/lazmapviewer/examples/trackdemo/track_demo.lpi b/components/lazmapviewer/examples/trackdemo/track_demo.lpi
index 8ca297c8a..70ebd2058 100644
--- a/components/lazmapviewer/examples/trackdemo/track_demo.lpi
+++ b/components/lazmapviewer/examples/trackdemo/track_demo.lpi
@@ -43,6 +43,7 @@
         <Filename Value="main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="MainForm"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit1>
     </Units>
@@ -58,6 +59,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>