Fix bugs encountered while building with VS 2017 64bit (#39)

2 files changed