Fixed zip issue + using NAA to identify LUNs