Fixes for Windows packaging.