Tweaks for Azure compatibility.