ExternalStorage Bug fixes