GRIM: Fix C++11 related warnings