- bugfixes for msvc compile