Fixed build
also fixed msvc 10 (2010) build