diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 9304eb0..55e4c56 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -756,7 +756,9 @@ _ngi_win_cb_mouse_down(void *data, int type, void *event)
         it->drag.y = ev->root.y;
         it->drag.start = 1;
         it->drag.dnd = 0;
-        ng->item_drag = it;
+
+	if (it->cb_drag_start)
+	  ng->item_drag = it;
      }
 
    ngi_item_mouse_down(it, ev);
@@ -853,7 +855,7 @@ _ngi_win_cb_mouse_move(void *data, int type, void *event)
              ng->item_drag->drag.dnd = 1;
              ng->item_drag->drag.start = 0;
 
-             ITEM_DRAG_START(ng->item_drag);
+	     ng->item_drag->cb_drag_start(ng->item_drag);
              ngi_item_mouse_out(ng->item_active);
 
              ng->item_active = NULL;
@@ -1923,7 +1925,7 @@ e_modapi_init(E_Module *m)
 	ngi_config = E_NEW(Config, 1);
 	ngi_config->version = (MOD_CONFIG_FILE_EPOCH << 16);
 
-	ngi_bar_new(0, 0);
+	ngi_bar_config_new(0, 0);
      }
 
    ngi_config->cfd = NULL;
diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index d2ebfe5..ac7899b 100644
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -16,20 +16,6 @@
 #define AUTOHIDE_FULLSCREEN	2
 #define AUTOHIDE_OVERLAP	3
 
-#define ITEM_MOUSE_WHEEL(_item, ev)	\
-  if(_item && _item->cb_mouse_wheel)    \
-    _item->cb_mouse_wheel(_item, ev);	\
-
-#define ITEM_DRAG_START(_item)          \
-  if(_item && _item->cb_drag_start)     \
-    _item->cb_drag_start(_item);        \
-
-#define ITEM_FREE(_item)                \
-  if(_item && _item->cb_free)           \
-    _item->cb_free(_item);              \
-  _item = NULL;                         \
-
-
 typedef struct _Config             Config;
 typedef struct _Config_Item        Config_Item;
 typedef struct _Config_Box         Config_Box;