Commit from VB repo

Changes to match the new installation on Windows