Remove C++11 issues with '=' operator.