Some fixes to build our bridge under MSVC 13