Tweaking to make it work on azure.