Fix bugs with unzip command