diff --git a/data/beach.track b/data/beach.track
index 7bf85a305..3131932c3 100644
--- a/data/beach.track
+++ b/data/beach.track
@@ -4,8 +4,8 @@
  (name "On the Beach")
  (description "Created by Ingo Ruhnke")
  (music "mods/Boom_boom_boom.mod")
- (screenshot "images/sshot-beach.rgb")
- (topview "images/topview-beach.rgb")
+ (screenshot "sshot-beach.rgb")
+ (topview "topview-beach.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/bsodcastle.track b/data/bsodcastle.track
index bcc66eaad..f5143a47d 100644
--- a/data/bsodcastle.track
+++ b/data/bsodcastle.track
@@ -4,8 +4,8 @@
  (name "BSODs Battlements")
  (description "Created by Oliver & Steve Baker")
  (music "oggs/Lava\ Lagoon_2.ogg")
- (screenshot "images/sshot-bsodcastle.rgb")
- (topview "images/topview-bsodcastle.rgb")
+ (screenshot "sshot-bsodcastle.rgb")
+ (topview "topview-bsodcastle.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/geekopeak.track b/data/geekopeak.track
index 713f98f20..dbf8b5b9a 100644
--- a/data/geekopeak.track
+++ b/data/geekopeak.track
@@ -4,8 +4,8 @@
  (name "Geeko Peak")
  (description "Created by Oliver & Steve Baker")
  (music "mods/tk2.mod")
- (screenshot "images/sshot-geekopeak.rgb")
- (topview "images/topview-geekopeak.rgb")
+ (screenshot "sshot-geekopeak.rgb")
+ (topview "topview-geekopeak.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/gownsbow.track b/data/gownsbow.track
index 555ceeb18..1f4acc6fa 100644
--- a/data/gownsbow.track
+++ b/data/gownsbow.track
@@ -5,8 +5,8 @@
  (description "Created by Oliver & Steve Baker")
  (gravity 78.0)
  (music "mods/tk5a.mod")
- (screenshot "images/sshot-gownsbow.rgb")
- (topview "images/topview-gownsbow.rgb")
+ (screenshot "sshot-gownsbow.rgb")
+ (topview "topview-gownsbow.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/islandtrack.track b/data/islandtrack.track
index fa1ed479f..1a45d25a8 100644
--- a/data/islandtrack.track
+++ b/data/islandtrack.track
@@ -4,8 +4,8 @@
  (name "The Island")
  (description "Created by Johannes Sjolund")
  (music "mods/Boom_boom_boom.mod")
- (screenshot "images/sshot-islandtrack.rgb")
- (topview "images/topview-islandtrack.rgb")
+ (screenshot "sshot-islandtrack.rgb")
+ (topview "topview-islandtrack.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/lighthouse.track b/data/lighthouse.track
index e4403d0c6..7a73ef9d1 100644
--- a/data/lighthouse.track
+++ b/data/lighthouse.track
@@ -4,8 +4,8 @@
  (name "Around the Lighthouse")
  (description "Created by Ingo Ruhnke")
  (music "mods/tk2.mod")
- (screenshot "images/sshot-lighthouse.rgb")
- (topview "images/topview-lighthouse.rgb")
+ (screenshot "sshot-lighthouse.rgb")
+ (topview "topview-lighthouse.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/littlevolcano.track b/data/littlevolcano.track
index 18c122bf0..918ae784d 100644
--- a/data/littlevolcano.track
+++ b/data/littlevolcano.track
@@ -16,8 +16,8 @@
  (sun-specular 1.0 0.8 0.8 0.0)
 
  (music "mods/tk5a.mod")
- (screenshot "images/sshot-littlevolcano.rgb")
- (topview "images/topview-littlevolcano.rgb")
+ (screenshot "sshot-littlevolcano.rgb")
+ (topview "topview-littlevolcano.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/olivermath.track b/data/olivermath.track
index 61a9e4cd6..a4783ed00 100644
--- a/data/olivermath.track
+++ b/data/olivermath.track
@@ -4,8 +4,8 @@
  (name "Oliver's Math Class")
  (description "Created by Oliver & Steve Baker")
  (music "mods/Boom_boom_boom.mod")
- (screenshot "images/sshot-olivermath.rgb")
- (topview "images/topview-olivermath.rgb")
+ (screenshot "sshot-olivermath.rgb")
+ (topview "topview-olivermath.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/race.track b/data/race.track
index 8d99a3067..2a260c753 100644
--- a/data/race.track
+++ b/data/race.track
@@ -4,8 +4,8 @@
  (name "Race Track")
  (description "Created by Ingo Ruhnke")
  (music "mods/tk5a.mod" "mods/tk2.mod")
- (screenshot "images/sshot-race.rgb")
- (topview "images/topview-race.rgb")
+ (screenshot "sshot-race.rgb")
+ (topview "topview-race.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/sandtrack.track b/data/sandtrack.track
index a94706fc7..38021ab64 100644
--- a/data/sandtrack.track
+++ b/data/sandtrack.track
@@ -4,8 +4,8 @@
  (name "Shifting Sands")
  (description "Created by Oliver & Steve Baker")
  (music "mods/tk7.mod")
- (screenshot "images/sshot-sandtrack.rgb")
- (topview "images/topview-sandtrack.rgb")
+ (screenshot "sshot-sandtrack.rgb")
+ (topview "topview-sandtrack.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/startrack.track b/data/startrack.track
index 88dcb21cf..084d051cb 100644
--- a/data/startrack.track
+++ b/data/startrack.track
@@ -5,8 +5,8 @@
  (sky-color    0.0 0.0 0.0 0.0)
  (description "Created by Ingo Ruhnke")
  (music "oggs/Ethereal\ Spectrum\ \(ver\ loop\).ogg")
- (screenshot "images/sshot-startrack.rgb")
- (topview "images/topview-startrack.rgb")
+ (screenshot "sshot-startrack.rgb")
+ (topview "topview-startrack.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/subseatrack.track b/data/subseatrack.track
index 90eabfc60..84083e4f3 100644
--- a/data/subseatrack.track
+++ b/data/subseatrack.track
@@ -15,8 +15,8 @@
  (sun-specular 0.8 0.8 1.0 0.0)
 
  (music "mods/tuxr.mod")
- (screenshot "images/sshot-subseatrack.rgb")
- (topview "images/topview-subseatrack.rgb")
+ (screenshot "sshot-subseatrack.rgb")
+ (topview "topview-subseatrack.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/tuxtrack.track b/data/tuxtrack.track
index 7147fa7cd..f52ca35a1 100644
--- a/data/tuxtrack.track
+++ b/data/tuxtrack.track
@@ -4,8 +4,8 @@
  (name        "Tux Tollway")
  (description "Created by Oliver & Steve Baker")
  (music       "mods/tk2.mod")
- (screenshot "images/sshot-tuxtrack.rgb")
- (topview "images/topview-tuxtrack.rgb")
+ (screenshot "sshot-tuxtrack.rgb")
+ (topview "topview-tuxtrack.rgb")
 )
 
 ;; EOF ;;
diff --git a/data/volcano.track b/data/volcano.track
index 18fad4f74..565dac93b 100644
--- a/data/volcano.track
+++ b/data/volcano.track
@@ -4,8 +4,8 @@
  (name "Volcano")
  (description "Created by Ingo Ruhnke")
  (music "mods/Boom_boom_boom.mod")
- (screenshot "images/sshot-volcano.rgb")
- (topview "images/topview-volcano.rgb")
+ (screenshot "sshot-volcano.rgb")
+ (topview "topview-volcano.rgb")
 )
 
 ;; EOF ;;
diff --git a/src/material_manager.cpp b/src/material_manager.cpp
index f2df07f82..dee10580f 100644
--- a/src/material_manager.cpp
+++ b/src/material_manager.cpp
@@ -240,7 +240,7 @@ Material *MaterialManager::getMaterial ( const char* fname )
 
     // Add the material: the material constructor adds the material
     // to (this) material_manager.
-    Material* m=new Material(fn,"");
+    Material* m=new Material(fname,"");
     // Since fn is a pointer into fname_copy, fname_copy must be freed
     // here, not earlier.
     free(fname_copy);