diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c
index 37e14f4cd..905316232 100644
--- a/src/chipset/via_apollo.c
+++ b/src/chipset/via_apollo.c
@@ -183,7 +183,6 @@ static void
 via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
 {
     via_apollo_t *dev = (via_apollo_t *) priv;
-	pclog("%02x: %02x\n", addr, val);
     if (func)
 	return;
 	
diff --git a/src/codegen_new/codegen.c b/src/codegen_new/codegen.c
index 103d14de0..6f25ef12a 100644
--- a/src/codegen_new/codegen.c
+++ b/src/codegen_new/codegen.c
@@ -139,7 +139,7 @@ static x86seg *codegen_generate_ea_16_long(ir_data_t *ir, x86seg *op_ea_seg, uin
 
                 switch (cpu_rm & 7)
                 {
-                        case 0: case 1: case 7:
+                        case 0: case 1: case 7: default:
                         base_reg = IREG_EBX;
                         break;
                         case 2: case 3: case 6:
@@ -705,7 +705,7 @@ generate_call:
                 }
         }
 
-codegen_skip:
+// codegen_skip:
         if ((op_table == x86_dynarec_opcodes_REPNE || op_table == x86_dynarec_opcodes_REPE) && !op_table[opcode | op_32])
         {
                 op_table = (OpFn *) x86_dynarec_opcodes;
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 658cd217f..4ff0993bd 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -71,7 +71,7 @@ machine_init_ex(int m)
     int ret = 0;
 
     if (!bios_only) {
-	machine_log("Initializing as \"%s\"\n", machine_getname_ex(m));
+	machine_log("Initializing as \"%s\"\n", machine_getname());
 
 	is_vpc = 0;
 
diff --git a/src/sio/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c
index b1c94f2bf..9ed1137ba 100644
--- a/src/sio/sio_fdc37c93x.c
+++ b/src/sio/sio_fdc37c93x.c
@@ -789,7 +789,7 @@ static const device_t access_bus_device = {
     0,
     0x03,
     access_bus_init, access_bus_close, NULL,
-    { NULL }, NULL, NULL,
+    NULL, NULL, NULL,
     NULL
 };