Windows build improvements

Various fixups on the VS solution and project files.