Minor changes for *certain* clusters not compliant with C++11