various fixes and cleanups relating to enabling node-telehash