(mostly) vwf fix.