Slight improvement to DeviceStorage detection