More fixes to the vsix.