Fix vimy weirness