diff --git a/input/drivers/psl1ght_input.c b/input/drivers/psl1ght_input.c
index e369465cec..d84743af5d 100644
--- a/input/drivers/psl1ght_input.c
+++ b/input/drivers/psl1ght_input.c
@@ -397,7 +397,7 @@ static uint16_t transform_buttons(const padData *data)
          );
 }
 
-static int16_t ps3_joypad_button(unsigned port, uint16_t joykey)
+static int32_t ps3_joypad_button(unsigned port, uint16_t joykey)
 {
    uint16_t state                       = 0;
    if (port >= MAX_PADS)
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 022db6d0c2..7195c3870f 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -738,7 +738,7 @@ static void task_save_handler(retro_task_t *task)
 
    if (!state->data)
    {
-      size_t size;
+      size_t size = 0;
       state->data = content_get_serialized_data(&size);
       state->size = (ssize_t)size;
    }