Remove adding hashes of virtual directories, other small fixes