Fixes for "deploy from Windows"