Updated to include new windows targeting.