diff --git a/include/sysapp/switch.h b/include/sysapp/switch.h
index ad4f854..a46e32d 100644
--- a/include/sysapp/switch.h
+++ b/include/sysapp/switch.h
@@ -11,8 +11,7 @@
 extern "C" {
 #endif
 
-//TODO
-typedef void sysapp_input_struct;
+typedef struct SysAppBrowserArgs SysAppBrowserArgs;
 
 void
 SYSSwitchToSyncControllerOnHBM();
@@ -27,7 +26,7 @@ void
 _SYSSwitchToMainApp();
 
 void
-SYSSwitchToBrowserForViewer(sysapp_input_struct*);
+SYSSwitchToBrowserForViewer(SysAppBrowserArgs *);
 
 #ifdef __cplusplus
 }
diff --git a/libraries/wutdevoptab_sd/devoptab_fs_utils.c b/libraries/wutdevoptab_sd/devoptab_fs_utils.c
index cbcfd68..1200acd 100644
--- a/libraries/wutdevoptab_sd/devoptab_fs_utils.c
+++ b/libraries/wutdevoptab_sd/devoptab_fs_utils.c
@@ -4,9 +4,9 @@ char *
 __wut_fs_fixpath(struct _reent *r,
                  const char *path)
 {
-   char *p = strchr(path, ':')+1;
+   char *p = strchr(path, ':') + 1;
 
-   if(!strchr(path, ':')) {
+   if (!strchr(path, ':')) {
       p = (char*)path;
    }
 
@@ -15,13 +15,13 @@ __wut_fs_fixpath(struct _reent *r,
       return NULL;
    }
 
-   char *__fixedpath = memalign(0x40, PATH_MAX+1);
+   char *__fixedpath = memalign(0x40, PATH_MAX + 1);
 
    if (__fixedpath == NULL) {
       return NULL;
    }
 
-   // cwd is handled by coreinit, so just strip the 'fs:' if it exists
+   // cwd is handled by coreinit, so just strip the 'device:' if it exists
    strcpy(__fixedpath, p);
    return __fixedpath;
 }