Merge in Borkata's changes
workaround sdcard detection issues