Fixes to allow sd card support with Gen7