FX-41; Some C++11 changes