VSIX fixes.