diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index b54cd98199..577891e456 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -72,13 +72,13 @@ PLUGIN_HEADER
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
 #define CALENDAR_QUIT       (BUTTON_SELECT|BUTTON_MENU)
-#define CALENDAR_SELECT     (BUTTON_SELECT|BUTTON_PLAY)
+#define CALENDAR_SELECT     (BUTTON_SELECT|BUTTON_REL)
 #define CALENDAR_NEXT_WEEK  BUTTON_SCROLL_FWD
 #define CALENDAR_PREV_WEEK  BUTTON_SCROLL_BACK
 #define CALENDAR_NEXT_DAY   BUTTON_RIGHT
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
-#define CALENDAR_PREV_MONTH BUTTON_MENU
+#define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_REL)
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
 #define CALENDAR_QUIT       BUTTON_POWER
@@ -185,6 +185,8 @@ PLUGIN_HEADER
 
 static const struct plugin_api* rb;
 
+MEM_FUNCTION_WRAPPERS(rb)
+
 static bool leap_year;
 /* days_in_month[][0] is for December */
 static const int days_in_month[2][13] = {