Some fixes to bitswap + dht