diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index 592ed25e4..ba67c4be9 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -210,6 +210,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 /* special - language inits its stuff the moment it goes away */
    eina_stringshare_del(e_config->language);
    e_config->language = eina_stringshare_ref(lang);
+   /* TODO: This can trigger a efreet cache rebuild, need to wait until it is done */
    e_intl_language_set(e_config->language);
    e_wizard_labels_update();
    return 1;
diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c
index 55ba244f4..203279c8b 100644
--- a/src/modules/wizard/page_070.c
+++ b/src/modules/wizard/page_070.c
@@ -17,6 +17,7 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
+   /* TODO: Wait until icon theme list is built */
    Eina_List *l, *themes = efreet_icon_theme_list_get();
    Efreet_Icon_Theme *th;
    int i;