Edits for MSVC compile