Small changes for compiling with MSVC 2013.