vhd-tool serve fixes