diff --git a/Makefile.ps2 b/Makefile.ps2
index e9f22d2726..c21e01e38c 100644
--- a/Makefile.ps2
+++ b/Makefile.ps2
@@ -21,7 +21,7 @@ else
 endif
 
 ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
+   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses -Wdiscarded-qualifiers
 endif
 
 INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index dcae69c62c..44798c115b 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -47,7 +47,7 @@ static void create_path_names(void)
 
    /* TODO/FIXME - third parameter here needs to be size of
     * rootDevicePath(bootDeviceID) */
-   strlcpy(user_path, rootDevicePath(bootDeviceID), rootDevicePath(bootDeviceID));
+   strlcpy(user_path, rootDevicePath(bootDeviceID), sizeof(user_path));
    strlcat(user_path, "RETROARCH", sizeof(user_path));
    
    /* Content in the same folder */
@@ -192,7 +192,7 @@ static void frontend_ps2_init(void *data)
 
 #if defined(BUILD_FOR_PCSX2)
    bootDeviceID = BOOT_DEVICE_MC0;
-   strlcpy(cwd, rootDevicePath(bootDeviceID), sizeof(rootDevicePath(bootDeviceID)));
+   strlcpy(cwd, rootDevicePath(bootDeviceID), sizeof(cwd));
 #else
    getcwd(cwd, sizeof(cwd));
    bootDeviceID = getBootDeviceID(cwd);
diff --git a/ps2/compat_files/ps2_devices.c b/ps2/compat_files/ps2_devices.c
index d996f75348..5a0f27db23 100644
--- a/ps2/compat_files/ps2_devices.c
+++ b/ps2/compat_files/ps2_devices.c
@@ -164,7 +164,7 @@ bool waitUntilDeviceIsReady(enum BootDeviceIDs device_id)
 {
    struct stat buffer;   
    int ret = -1;
-   int retries = 10;
+   int retries = 100;
    char *rootDevice = rootDevicePath(device_id);
 
    while(ret != 0 && retries > 0)