diff --git a/database_info.c b/database_info.c
index 212f314c93..6e2093001d 100644
--- a/database_info.c
+++ b/database_info.c
@@ -60,7 +60,7 @@ static bool zlib_compare_crc32(const char *name, const char *valid_exts,
 database_info_rdl_handle_t *database_info_write_rdl_init(const char *dir)
 {
    const char *exts = "";
-   database_info_rdl_handle_t *dbl = calloc(1, sizeof(*dbl));
+   database_info_rdl_handle_t *dbl = (database_info_rdl_handle_t*)calloc(1, sizeof(*dbl));
 
    if (!dbl)
       return NULL;
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 2419a19758..8af1a0dad8 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -1012,6 +1012,7 @@ rarch_joypad_driver_t dinput_joypad = {
    dinput_joypad_query_pad,
    dinput_joypad_destroy,
    dinput_joypad_button,
+   NULL,
    dinput_joypad_axis,
    dinput_joypad_poll,
    NULL,