all: Fix incompatibilities with recent VW