diff --git a/src/drivers/common/cheat.cpp b/src/drivers/common/cheat.cpp
index a364ff02..be73bb6b 100644
--- a/src/drivers/common/cheat.cpp
+++ b/src/drivers/common/cheat.cpp
@@ -348,7 +348,7 @@ static void ListCheats(void)
  {
   char tmp[32];
   printf(" <(T)oggle status, (M)odify, or (D)elete this cheat.> ");
-  fgets(tmp,ARRAY_SIZE(buf),stdin);
+  fgets(tmp,ARRAY_SIZE(tmp),stdin);
   switch(tolower(tmp[0]))
   {
    case 't':ToggleCheat(which);
@@ -405,7 +405,7 @@ static int ShowShortList(char *moe[], int n, int def)
  clo:
 
  printf("\nSelection [%d]> ",def+1);
- fgets(tmp,ARRAY_SIZE(buf),stdin);
+ fgets(tmp,ARRAY_SIZE(tmp),stdin);
  if(tmp[0]=='\n')
   return def;
  c=tolower(tmp[0]);
diff --git a/src/input/bworld.cpp b/src/input/bworld.cpp
index a91acb0d..a154930c 100644
--- a/src/input/bworld.cpp
+++ b/src/input/bworld.cpp
@@ -22,7 +22,7 @@
 #include "share.h"
 
 static int seq,ptr,bit,cnt,have;
-static uint8 bdata[20];
+static uint8 bdata[32];
 
 
 static uint8 Read(int w, uint8 ret)
@@ -60,8 +60,7 @@ static void Update(void *data, int arg)
   *(uint8 *)data=0;
   seq=ptr=0;
   have=1;
-  strcpy((char*)bdata,(char *)data+1); //mbg merge 7/17/06 added casts
-  strcpy((char*)&bdata[13],"SUNSOFT"); //mbg merge 7/17/06 added cast
+  snprintf((char*)bdata, ARRAY_SIZE(bdata), "%s%s", (char*) data + 1, "SUNSOFT"); //mbg merge 7/17/06
  }
 }
 
diff --git a/src/oldmovie.cpp b/src/oldmovie.cpp
index 4d200c66..1672fdcf 100644
--- a/src/oldmovie.cpp
+++ b/src/oldmovie.cpp
@@ -543,7 +543,7 @@ EFCM_CONVERTRESULT convert_fcm(MovieData& md, std::string fname)
 
 
 	EMUFILE* fp = FCEUD_UTF8_fstream(fname, "rb");
-	if(!fp) false;
+	if(!fp) FCM_CONVERTRESULT_FAILOPEN;
 
 	// read header
 	uint32 magic = 0;