Fixes to make Azure publish work