MSVC compiling fixes

No functional change.

Resolves #150