Revert "Remove unused variables"

This reverts commit cf5f7f8dbbc707eac8c3e6ef47b6046a7bb35b74.
0.9.6 binaries for Windows
Version 0.9.6
Fix test for short platform name criteria
Fix two small compiler warnings on VS