Some initial fixes for the windows build

2020-10-14, Gary Kramlich