Make stuff build cleanly on msvc12