Correct build issues found when trying windows + ninja.