Fix yz-setup to use new kv branch