Fixed two small issues preventing win building.