Fix compile errors
Fix compile error
Fix msvc