Minor tweaks to get Azure publishing working