(XDK/MSVC) Fix some build errors (not completle yet)