Updates to vchan stuff