c++11 compat fixes