diff --git a/cores/libretro-gong/gong.c b/cores/libretro-gong/gong.c
index 58dbfd3f16..61833075fc 100644
--- a/cores/libretro-gong/gong.c
+++ b/cores/libretro-gong/gong.c
@@ -393,11 +393,11 @@ void GONG_CORE_PREFIX(retro_init)(void)
    else
       GONG_CORE_PREFIX(log_cb) = NULL;
 
-   video_buf = (unsigned char*)calloc(1, WIDTH * HEIGHT * sizeof(unsigned));
+   video_buf = (unsigned char*)calloc(1, WIDTH * HEIGHT * sizeof(unsigned char));
 
-   game_buffer.width = WIDTH;
+   game_buffer.width  = WIDTH;
    game_buffer.height = HEIGHT;
-   game_buffer.pitch = WIDTH * sizeof(unsigned);
+   game_buffer.pitch  = WIDTH * sizeof(unsigned);
    game_buffer.memory = video_buf;
 }
 
diff --git a/libretro-common/encodings/encoding_crc32.c b/libretro-common/encodings/encoding_crc32.c
index 9724f3eff7..38b3de2545 100644
--- a/libretro-common/encodings/encoding_crc32.c
+++ b/libretro-common/encodings/encoding_crc32.c
@@ -119,8 +119,8 @@ uint32_t file_crc32(uint32_t crc, const char *path)
 
    for(i = 0; i < CRC32_MAX_MB; i++)
    {
-      int nread = filestream_read(file, buf, CRC32_BUFFER_SIZE);
-      if (nread < 0)
+      int64_t nread = filestream_read(file, buf, CRC32_BUFFER_SIZE);
+      if (nread < 0)		
          goto error;
 
       crc = encoding_crc32(crc, buf, nread);
diff --git a/retroarch.c b/retroarch.c
index b1e111f810..deecbe8159 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4152,8 +4152,7 @@ static enum runloop_state runloop_check_state(
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
       if (!video_driver_has_widgets())
 #endif
-         if (state_manager_check_rewind(BIT256_GET(current_input, RARCH_REWIND),
-                  settings->uints.rewind_granularity, runloop_is_paused, s, sizeof(s), &t))
+         if (rewinding)
             runloop_msg_queue_push(s, 0, t, true, NULL,
                         MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
diff --git a/runtime_file.c b/runtime_file.c
index b2125a1bbb..ffeb9cd9df 100644
--- a/runtime_file.c
+++ b/runtime_file.c
@@ -775,9 +775,9 @@ void runtime_log_convert_hms2usec(unsigned hours, unsigned minutes, unsigned sec
 /* Convert from microseconds to hours, minutes, seconds */
 void runtime_log_convert_usec2hms(retro_time_t usec, unsigned *hours, unsigned *minutes, unsigned *seconds)
 {
-   *seconds = usec / 1000000;
-   *minutes = *seconds / 60;
-   *hours = *minutes / 60;
+   *seconds  = usec / 1000000;
+   *minutes  = *seconds / 60;
+   *hours    = *minutes / 60;
    
    *seconds -= *minutes * 60;
    *minutes -= *hours * 60;