MSVC Fixes 2

Submitting missing files from previous submission