More fixes for windows build errors.