Gringo - C++11 fixes

PR for the bots to test.