More vpath fixes