diff --git a/src/bin/inspect.c b/src/bin/inspect.c
index 75566f1..3d98d97 100644
--- a/src/bin/inspect.c
+++ b/src/bin/inspect.c
@@ -942,7 +942,7 @@ _gl_img_show(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
    Exactness_Image *ex_img = data;
    if (_img_win) efl_del(_img_win);
    _img_win = efl_add(EFL_UI_WIN_CLASS, elm_win_get(obj),
-         efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC),
+         efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
          efl_ui_win_autodel_set(efl_added, EINA_TRUE));
    efl_wref_add(_img_win, &_img_win);
 
diff --git a/src/bin/recorder.c b/src/bin/recorder.c
index d3a875e..ada17d2 100644
--- a/src/bin/recorder.c
+++ b/src/bin/recorder.c
@@ -132,7 +132,7 @@ _event_pointer_cb(void *data, const Efl_Event *event)
       case EFL_POINTER_ACTION_MOVE:
           {
              double rad = 0, radx = 0, rady = 0, pres = 0, ang = 0, fx = 0, fy = 0;
-             int tool = efl_input_pointer_tool_get(evp);
+             int tool = efl_input_pointer_touch_id_get(evp);
              Eina_Position2D pos = efl_input_pointer_position_get(evp);
              Exactness_Action_Multi_Move t = { tool, pos.x, pos.y, rad, radx, rady, pres, ang, fx, fy };
              if (n_evas >= 0) _add_to_list(evt, n_evas, timestamp, &t, sizeof(t));
@@ -142,7 +142,7 @@ _event_pointer_cb(void *data, const Efl_Event *event)
           {
              double rad = 0, radx = 0, rady = 0, pres = 0, ang = 0, fx = 0, fy = 0;
              int b = efl_input_pointer_button_get(evp);
-             int tool = efl_input_pointer_tool_get(evp);
+             int tool = efl_input_pointer_touch_id_get(evp);
              Eina_Position2D pos = efl_input_pointer_position_get(evp);
              Efl_Pointer_Flags flags = efl_input_pointer_button_flags_get(evp);
              Exactness_Action_Multi_Event t = { tool, b, pos.x, pos.y, rad, radx, rady, pres, ang,
@@ -211,7 +211,7 @@ _event_key_cb(void *data, const Efl_Event *event)
         t.keyname = eina_stringshare_add(key);
         t.key = eina_stringshare_add(efl_input_key_get(evk));
         t.string = eina_stringshare_add(efl_input_key_string_get(evk));
-        t.compose = eina_stringshare_add(efl_input_key_compose_get(evk));
+        t.compose = eina_stringshare_add(efl_input_key_compose_string_get(evk));
         t.keycode = efl_input_key_code_get(evk);
         _add_to_list(evt, n_evas, timestamp, &t, sizeof(t));
      }