diff --git a/Microsoft.AVS.VMFS/Microsoft.AVS.VMFS.psm1 b/Microsoft.AVS.VMFS/Microsoft.AVS.VMFS.psm1
index bde1f8e..31ed707 100644
--- a/Microsoft.AVS.VMFS/Microsoft.AVS.VMFS.psm1
+++ b/Microsoft.AVS.VMFS/Microsoft.AVS.VMFS.psm1
@@ -363,7 +363,7 @@ function New-VmfsDatastore {
         Write-Error $Global:Error[0]
     }
 
-    $Cluster | Get-VMHost | Get-VMHostStorage -RescanAllHba | Out-Null
+    $Cluster | Get-VMHost | Get-VMHostStorage -RescanAllHba -RescanVmfs | Out-Null
     $Datastore = Get-Datastore -Name $DatastoreName -ErrorAction Ignore
     if (-not $Datastore -or $Datastore.type -ne "VMFS") {
         throw "Failed to create datastore $DatastoreName."
@@ -574,10 +574,6 @@ function Restore-VmfsVolume {
         $DatastoreName
     )
 
-    if ($DeviceNaaId -notlike 'naa.624a9370*') {
-        throw "Invalid Device NAA ID $DeviceNaaId provided."
-    }
-
     $Cluster = Get-Cluster -Name $ClusterName -ErrorAction Ignore
     if (-not $Cluster) {
         throw "Cluster $ClusterName does not exist."
@@ -1940,4 +1936,4 @@ function Clear-DisconnectedIscsiTargets {
             $VMHost | Get-VMHostStorage -RescanAllHba -RescanVmfs
         }
     }
-}
\ No newline at end of file
+}