Fix for DeviceStorage detection