Tweaked vapour to correct race i18n situation, and Boolean