xvba: squash me, fix after refactoring of settings