Misc changes for ClickOnce functionality