diff --git a/magic/src/checkerboard.c b/magic/src/checkerboard.c
index 692fbae4d..12c3f7a8d 100644
--- a/magic/src/checkerboard.c
+++ b/magic/src/checkerboard.c
@@ -74,7 +74,7 @@ int checkerboard_init(magic_api * api)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/sounds/magic/checkerboard.ogg", api->data_directory);
+  snprintf(fname, sizeof(fname), "%ssounds/magic/checkerboard.ogg", api->data_directory);
   checkerboard_snd = Mix_LoadWAV(fname);
 
   return (1);
@@ -89,7 +89,7 @@ SDL_Surface *checkerboard_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/images/magic/checkerboard.png", api->data_directory);
+  snprintf(fname, sizeof(fname), "%simages/magic/checkerboard.png", api->data_directory);
 
   return (IMG_Load(fname));
 }
diff --git a/magic/src/clone.c b/magic/src/clone.c
index c5db10d0e..da667c950 100644
--- a/magic/src/clone.c
+++ b/magic/src/clone.c
@@ -93,10 +93,10 @@ int clone_init(magic_api * api)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/sounds/magic/clone_start.ogg", api->data_directory);
+  snprintf(fname, sizeof(fname), "%ssounds/magic/clone_start.ogg", api->data_directory);
   clone_start_snd = Mix_LoadWAV(fname);
 
-  snprintf(fname, sizeof(fname), "%s/sounds/magic/clone.ogg", api->data_directory);
+  snprintf(fname, sizeof(fname), "%ssounds/magic/clone.ogg", api->data_directory);
   clone_snd = Mix_LoadWAV(fname);
 
   clone_state = CLONE_READY_TO_START;
@@ -121,7 +121,7 @@ SDL_Surface *clone_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/images/magic/clone.png", api->data_directory);
+  snprintf(fname, sizeof(fname), "%simages/magic/clone.png", api->data_directory);
 
   return (IMG_Load(fname));
 }
@@ -319,7 +319,7 @@ int clone_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
 void clone_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
                      int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
 {
-  clone_last = SDL_CreateRGBSurface(SDL_ANYFORMAT, canvas->w, canvas->h, canvas->format->BitsPerPixel,
+  clone_last = SDL_CreateRGBSurface(0, canvas->w, canvas->h, canvas->format->BitsPerPixel,
                                     canvas->format->Rmask, canvas->format->Gmask, canvas->format->Bmask,
                                     canvas->format->Amask);
 
diff --git a/magic/src/pixels.c b/magic/src/pixels.c
index 06daf40bb..3218e8939 100644
--- a/magic/src/pixels.c
+++ b/magic/src/pixels.c
@@ -73,7 +73,7 @@ int pixels_init(magic_api * api)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/sounds/magic/pixels.ogg", api->data_directory);
+  snprintf(fname, sizeof(fname), "%ssounds/magic/pixels.ogg", api->data_directory);
   pixel_snd = Mix_LoadWAV(fname);
 
   return (1);
@@ -95,7 +95,7 @@ SDL_Surface *pixels_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/images/magic/pixels.png", api->data_directory);
+  snprintf(fname, sizeof(fname), "%simages/magic/pixels.png", api->data_directory);
 
   return (IMG_Load(fname));
 }