dev/win32-minor-fixes

Minor code cleanup