Small fixes to MSVC building
Merge pull request #1 from Namihcah/master

Small fixes to MSVC building