fixed compilation in msvc. un-inlined some methods