WIP: Adapt to 3.3, fix compilation with MSVC2010