Small change to ID generation to avoid unnecessarily large numbers
Some files needed to build the windows executable