Fixed many (but not all) Boost/C++11 clashes