cherry-pick virtif changes
fix typos in previous
one final(?) typo fix
Source for buildrump.sh git rev 073f1fea9f7fcb6c9191aa2c28d2380df106ce57