Run script fixes for Windows after package & assembly change
Merge pull request #884 from mateiz/win-fixes

Run script fixes for Windows after package & assembly change