dev/win32-minor-fix

Fixes several minor VC++ warnings