Changes for C++0x