compiling fixes for visual c++ 11/12

last master doesn't compile with visual c++