Fix External Storage issues in Recovery