diff --git a/source/sound/Fir_Resampler.h b/source/sound/Fir_Resampler.h
index 959716f..adcde75 100644
--- a/source/sound/Fir_Resampler.h
+++ b/source/sound/Fir_Resampler.h
@@ -24,7 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
 #define WRITE_OFFSET  (WIDTH * STEREO) - STEREO
 #define GAIN          1.0
 
-typedef signed long int sample_t;
+typedef signed int sample_t;
 
 extern int Fir_Resampler_initialize( int new_size );
 extern void Fir_Resampler_shutdown( void );
diff --git a/source/sound/sound.c b/source/sound/sound.c
index 2b06ece..38abfc0 100644
--- a/source/sound/sound.c
+++ b/source/sound/sound.c
@@ -48,7 +48,7 @@ static unsigned int fm_cycles_count;
 
 /* YM chip function pointers */
 static void (*YM_Reset)(void);
-static void (*YM_Update)(long int *buffer, int length);
+static void (*YM_Update)(int *buffer, int length);
 static void (*YM_Write)(unsigned int a, unsigned int v);
 
 /* Run FM chip for required M-cycles */
diff --git a/source/sound/ym2413.c b/source/sound/ym2413.c
index 457de82..7331040 100644
--- a/source/sound/ym2413.c
+++ b/source/sound/ym2413.c
@@ -1681,7 +1681,7 @@ unsigned int YM2413Read(unsigned int a)
   return 0xF8 | ym2413.status;
 }
 
-void YM2413Update(long int *buffer, int length)
+void YM2413Update(int *buffer, int length)
 {
   int i, out;
 
diff --git a/source/sound/ym2413.h b/source/sound/ym2413.h
index 866f204..746d190 100644
--- a/source/sound/ym2413.h
+++ b/source/sound/ym2413.h
@@ -14,7 +14,7 @@
 
 extern void YM2413Init(double clock, int rate);
 extern void YM2413ResetChip(void);
-extern void YM2413Update(long int *buffer, int length);
+extern void YM2413Update(int *buffer, int length);
 extern void YM2413Write(unsigned int a, unsigned int v);
 extern unsigned int YM2413Read(unsigned int a);
 extern unsigned char *YM2413GetContextPtr(void);
diff --git a/source/sound/ym2612.c b/source/sound/ym2612.c
index e417fb2..f6fd5e9 100644
--- a/source/sound/ym2612.c
+++ b/source/sound/ym2612.c
@@ -2045,11 +2045,11 @@ unsigned int YM2612Read(void)
   return ym2612.OPN.ST.status & 0xff;
 }
 
-/* Generate 16 bits samples for ym2612 */
-void YM2612Update(long int *buffer, int length)
+/* Generate samples for ym2612 */
+void YM2612Update(int *buffer, int length)
 {
   int i;
-  long int lt,rt;
+  int lt,rt;
 
   /* refresh PG increments and EG rates if required */
   refresh_fc_eg_chan(&ym2612.CH[0]);
diff --git a/source/sound/ym2612.h b/source/sound/ym2612.h
index bad5c0b..f26c78d 100644
--- a/source/sound/ym2612.h
+++ b/source/sound/ym2612.h
@@ -18,7 +18,7 @@
 
 extern void YM2612Init(double clock, int rate);
 extern void YM2612ResetChip(void);
-extern void YM2612Update(long int *buffer, int length);
+extern void YM2612Update(int *buffer, int length);
 extern void YM2612Write(unsigned int a, unsigned int v);
 extern unsigned int YM2612Read(void);
 extern unsigned char *YM2612GetContextPtr(void);
diff --git a/source/win/fileio.c b/source/win/fileio.c
index 1add2df..e1a9f13 100644
--- a/source/win/fileio.c
+++ b/source/win/fileio.c
@@ -47,7 +47,6 @@
 int load_archive(char *filename)
 {
   int size = 0;
-  char msg[64];
   
   /* ROM buffer should be allocated first */
   if (cart.rom == NULL)