fix msvc cmake builds; slight cleanup