Windows build: add two more checks