c++11 fixes: part 1...