Getting closer to compiling with MSVC 2013