More sdcard1 fixes