diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index 0aa634c145..9ba29b1937 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -325,17 +325,17 @@ _elm_button_label_get(const Evas_Object *obj, const char *item)
 static char *
 _access_info_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
 {
-   char *txt = (char *)elm_widget_access_info_get(obj);
-   if (!txt) txt = (char *)_elm_button_label_get(obj, NULL);
+   const char *txt = elm_widget_access_info_get(obj);
+   if (!txt) txt = _elm_button_label_get(obj, NULL);
    if (txt) return strdup(txt);
-   return txt;
+   return NULL;
 }
 
 static char *
 _access_state_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
 {
    if (elm_widget_disabled_get(obj))
-      return strdup(E_("State: Disabled"));
+     return strdup(E_("State: Disabled"));
    return NULL;
 }
 
diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c
index d74986c2fe..5994ac2d15 100644
--- a/legacy/elementary/src/lib/elm_check.c
+++ b/legacy/elementary/src/lib/elm_check.c
@@ -255,10 +255,10 @@ _elm_check_label_get(const Evas_Object *obj, const char *item)
 static char *
 _access_info_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
 {
-   char *txt = (char *)elm_widget_access_info_get(obj);
-   if (!txt) txt = (char *)_elm_check_label_get(obj, NULL);
+   const char *txt = elm_widget_access_info_get(obj);
+   if (!txt) txt = _elm_check_label_get(obj, NULL);
    if (txt) return strdup(txt);
-   return txt;
+   return NULL;
 }
 
 static char *
@@ -268,9 +268,9 @@ _access_state_cb(void *data, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
    Widget_Data *wd = elm_widget_data_get(o);
    if (!wd) return NULL;
    if (elm_widget_disabled_get(obj))
-      return strdup(E_("State: Disabled"));
+     return strdup(E_("State: Disabled"));
    if (wd->state)
-      return strdup(E_("State: On"));
+     return strdup(E_("State: On"));
    return strdup(E_("State: Off"));
 }