[FIX] C++11 fixes