Develop

Minor changes to attempt to correct some MSVC wanrings.