diff --git a/cheevos/cheevos_menu.c b/cheevos/cheevos_menu.c
index dda3989f62..e8e46c43ed 100644
--- a/cheevos/cheevos_menu.c
+++ b/cheevos/cheevos_menu.c
@@ -401,7 +401,7 @@ void rcheevos_menu_populate_hardcore_pause_submenu(void* data)
       {
          menu_entries_append_enum(info->list,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_CANCEL),
-               msg_hash_to_str(MENU_ENUM_SUBLABEL_ACHIEVEMENT_PAUSE_CANCEL),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL),
                MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL,
                MENU_SETTING_ACTION_CLOSE, 0, 0);
          menu_entries_append_enum(info->list,
@@ -414,7 +414,7 @@ void rcheevos_menu_populate_hardcore_pause_submenu(void* data)
       {
          menu_entries_append_enum(info->list,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME_CANCEL),
-               msg_hash_to_str(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME_CANCEL),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL),
                MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL,
                MENU_SETTING_ACTION_CLOSE, 0, 0);
          menu_entries_append_enum(info->list,
@@ -451,13 +451,13 @@ void rcheevos_menu_populate(void* data)
          if (rcheevos_locals->hardcore_active)
             menu_entries_append_enum(info->list,
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU),
+                  msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU),
                   MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
                   MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
          else
             menu_entries_append_enum(info->list,
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU),
+                  msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU),
                   MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
                   MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
       }
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index bde722a3fe..496b40b77a 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -23,8 +23,24 @@ MSG_HASH(
    "retro_achievements"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU,
-   "toggle_cheevos_hardcore"
+   MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
+   "achievement_pause_menu"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL,
+   "achievement_pause_cancel"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL,
+   "achievement_resume_cancel"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
+   "achievement_pause"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
+   "achievement_resume"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_ACCOUNTS_TWITCH,
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index afbacf682b..d08093865f 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -852,7 +852,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
 #ifdef HAVE_VIDEO_LAYOUT
       {MENU_ENUM_LABEL_VIDEO_LAYOUT_PATH, deferred_push_video_layout_path}, 
 #endif
-      {MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU, deferred_push_achievement_pause_menu},
+      {MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU, deferred_push_achievement_pause_menu},
       {MENU_ENUM_LABEL_ACHIEVEMENT_LIST, deferred_push_achievement_list},
       {MENU_ENUM_LABEL_CORE_COUNTERS, deferred_push_core_counters},
       {MENU_ENUM_LABEL_FRONTEND_COUNTERS, deferred_push_frontend_counters},
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 7906e2f6d7..1d28f891df 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -1177,7 +1177,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       {MENU_ENUM_LABEL_DEFERRED_PLAYLIST_MANAGER_LIST,
          action_get_playlist_manager_list},
 #ifdef HAVE_CHEEVOS
-      {MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU,
+      {MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
          action_get_title_achievement_pause_menu},
       {MENU_ENUM_LABEL_ACHIEVEMENT_LIST,
          action_get_title_cheevos_list},
diff --git a/state_manager.c b/state_manager.c
index 262a245913..0f0371dcb5 100644
--- a/state_manager.c
+++ b/state_manager.c
@@ -578,11 +578,20 @@ void state_manager_event_init(
       struct state_manager_rewind_state *rewind_st,
       unsigned rewind_buffer_size)
 {
-   void *state          = NULL;
+   core_info_t *core_info = NULL;
+   void *state            = NULL;
 
    if (!rewind_st || rewind_st->state)
       return;
 
+   /* We cannot initialise the rewind buffer
+    * unless the core info struct for the current
+    * core has been initialised (i.e. without this,
+    * the savestate support level for the current
+    * core is unknown) */
+   if (!core_info_get_current_core(&core_info) || !core_info)
+      return;
+
    if (!core_info_current_supports_rewind())
    {
       RARCH_ERR("%s\n", msg_hash_to_str(MSG_REWIND_UNSUPPORTED));