[WIP] C++11 with MSVC 2013 fixes