fixes for c++0x