Fix Windows build

Check and fix solution on Windows