More robust SDHC support