Update to C++11-SQUIDS compatibility