IIS "support" and other tweaks from the 4.0.x branch.