More windows build fixes