Changes to make package run on Windows