diff --git a/stella/src/common/SoundSDL.cxx b/stella/src/common/SoundSDL.cxx
index 8b33c7c39..468442227 100644
--- a/stella/src/common/SoundSDL.cxx
+++ b/stella/src/common/SoundSDL.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: SoundSDL.cxx,v 1.20 2005-08-25 15:19:17 stephena Exp $
+// $Id: SoundSDL.cxx,v 1.21 2005-08-25 16:29:52 stephena Exp $
 //============================================================================
 
 #ifdef SOUND_SUPPORT
@@ -101,7 +101,7 @@ void SoundSDL::initialize(bool forcerestart)
 #ifndef PSP
       desired.freq   = 31400;
       desired.format = AUDIO_U8;
-else
+#else
       desired.freq   = 44100;
       desired.format = AUDIO_U16;
 #endif
diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index 66f462412..659ea3f60 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.87 2005-08-25 15:19:17 stephena Exp $
+// $Id: EventHandler.cxx,v 1.88 2005-08-25 16:29:52 stephena Exp $
 //============================================================================
 
 #include <algorithm>
@@ -1434,13 +1434,13 @@ void EventHandler::takeSnapshot()
   string sspath = myOSystem->settings().getString("ssdir");
   string ssname = myOSystem->settings().getString("ssname");
 
-  char separator = ssname[ssname.length()-1] != '/' ? BSPF_PATH_SEPARATOR : '';
+  if(sspath.substr(sspath.length()-1) != BSPF_PATH_SEPARATOR)
+    sspath += BSPF_PATH_SEPARATOR;
+
   if(ssname == "romname")
-    sspath = sspath + separator +
-             myOSystem->console().properties().get("Cartridge.Name");
+    sspath += myOSystem->console().properties().get("Cartridge.Name");
   else if(ssname == "md5sum")
-    sspath = sspath + separator +
-             myOSystem->console().properties().get("Cartridge.MD5");
+    sspath += myOSystem->console().properties().get("Cartridge.MD5");
 
   // Check whether we want multiple snapshots created
   if(!myOSystem->settings().getBool("sssingle"))
diff --git a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
index c00af8314..02cb78702 100644
--- a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
+++ b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: bspf.hxx,v 1.9 2005-08-25 15:19:17 stephena Exp $
+// $Id: bspf.hxx,v 1.10 2005-08-25 16:29:52 stephena Exp $
 //============================================================================
 
 #ifndef BSPF_HXX
@@ -24,7 +24,7 @@
   that need to be defined for different operating systems.
 
   @author Bradford W. Mott
-  @version $Id: bspf.hxx,v 1.9 2005-08-25 15:19:17 stephena Exp $
+  @version $Id: bspf.hxx,v 1.10 2005-08-25 16:29:52 stephena Exp $
 */
 
 // Types for 8-bit signed and unsigned integers
@@ -53,7 +53,7 @@ typedef unsigned int uInt32;
 #endif
 
 #ifdef PSP
-	#include "pspstdint.h"
+  #include "pspstdint.h"
 #endif
 	
 #ifdef HAVE_INTTYPES