Moves/fixes to work with new windows packaging.